Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp		2014-03-31 14:42:00 +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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
directx	renamed **2 -> **	2014-02-04 19:55:11 +04:00
gpu	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04: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