Marina Kolpakova 162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811		2012-06-28 17:07:17 +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 Manager and new java layout	2012-06-28 16:23:19 +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 Android Manager and new java layout	2012-06-28 16:23:19 +00:00