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
..
android	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-17 15:24:05 +04:00
c	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-03 13:23:59 +04:00
cpp	Fixed Bug #3568: Build fails with WITH_OPENGL=ON	2014-02-25 14:34:32 +05:30
directx	renamed **2 -> **	2014-02-04 19:55:11 +04:00
gpu	Deleted an assignment to a variable that doesn't exist.	2014-02-14 14:37:56 +04:00
java	add clojure sample	2013-12-11 13:26:47 +01:00
MacOSX/FaceTracker	Converted tabs to spaces.	2013-08-21 18:59:26 +04:00
python2	grabcut.py sample: Allow drawing rect from bottom/right	2014-02-10 16:53:17 +01:00
tapi	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-03 13:23:59 +04:00
winrt	typos	2014-03-02 21:04:17 +04:00
CMakeLists.txt	one more ocl deletion	2014-02-01 21:50:14 +04:00