Andrey Kamaev 57fb5f0981 Merged Android build fix		2012-06-28 19:32:32 +00:00
..
android_lib	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
android_test	Merged Android build fix	2012-06-28 19:32:32 +00:00
generator	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
check-tests.py	Added new tests written by Hussein Abdinoor; Added support for new classes in features2d and imgproc	2011-08-10 12:35:22 +00:00
CMakeLists.txt	merged trunk r8815:8827	2012-06-28 17:28:27 +00:00