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	fixed warnings from OCL and DOC builders	2014-02-04 21:19:31 +04:00
include/opencv2	Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray	2014-02-06 12:55:04 +04:00
perf	Merge pull request #2261 from jet47:stitching-cuda-android	2014-02-03 15:35:55 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
test	Merge pull request #2261 from jet47:stitching-cuda-android	2014-02-03 15:35:55 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00