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	Doc fix.	2014-01-16 16:30:54 +02:00
include/opencv2	Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode	2014-02-19 14:48:57 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #2433 from ilya-lavrenov:typos	2014-03-03 12:20:35 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-27 15:28:14 +04:00