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
..
include/opencv2	eliminated restriction src[i].channels() == 1 in cv::merge	2014-03-19 13:56:31 +04:00
misc	Misprint fixed in table formatter	2014-03-24 11:04:49 +04:00
src	changing default perf strategy from BASIC (old) to SIMPLE (new, faster)	2014-03-21 18:29:06 +04:00
CMakeLists.txt	Merge commit '60906d917' into merge-2.4	2013-12-30 16:47:05 +04:00