Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp		2014-03-03 13:45:22 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
include/opencv2	Merge remote-tracking branch 'original/master' into constrained-hough-lines	2014-01-31 14:27:51 -08:00
perf	ported 2.4 perf tests for matchTemplate	2014-02-20 18:11:56 +04:00
src	Merge pull request #2393 from ilya-lavrenov:coverity	2014-02-26 12:16:36 +04:00
test	Merge pull request #2393 from ilya-lavrenov:coverity	2014-02-26 12:16:36 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00