Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp		2013-07-08 18:47:38 +04:00
..
android_lib	Merge pull request #800 from asmorkalov:android_cam_idx_semantic	2013-04-29 10:00:08 +04:00
android_test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
generator	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-08 18:47:38 +04:00
test	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Fixed the shebang lines on the Python scripts.	2013-04-11 18:37:23 +04:00
CMakeLists.txt	fix for #3077	2013-06-14 20:25:23 +04:00