Merge commit 'b94963d38' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)
commit39fb8e03d71e2bd90d050ed79d5e21f89d942a18
tree1543703a1b0c5b0f08050bddc8967a4299fbc637
parentce7a2f7edc024d18b02e51e639542b4d6f01765f
parentb94963d381ec3ed15e0802be7f00b04507618fd1
Merge commit 'b94963d38' into merge-2.4

Conflicts:
cmake/OpenCVGenAndroidMK.cmake