Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +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'	2013-08-06 13:56:49 +04:00
generator	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +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