Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp modules/core/src/out.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/doc/introduction.rst modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/generalized_hough.cpp modules/nonfree/perf/perf_main.cpp		2014-04-07 14:59:34 +04:00
..
android_lib	Switched OpenCV to a 3-component version number.	2013-11-15 19:41:53 +04:00
android_test	added cv::intergal to T-API	2013-12-06 13:18:25 +04:00
generator	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-07 14:59:34 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-22 14:28:00 +04:00
build.xml.in	Fix for encoding errors when building Java source	2013-03-27 17:43:00 +04:00
check-tests.py	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-03 13:23:59 +04:00