Roman Donchenko cca2e5d8b1 Merge pull request #1536 from asmorkalov:android_ndk_r9_master		2013-10-04 16:36:44 +04:00
..
doc	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
include/opencv2	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #1536 from asmorkalov:android_ndk_r9_master	2013-10-04 16:36:44 +04:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00