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
..
common_interfaces_of_descriptor_extractors.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04:00
common_interfaces_of_descriptor_matchers.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04:00
common_interfaces_of_feature_detectors.rst	doc fix	2014-01-25 14:44:28 +04:00
common_interfaces_of_generic_descriptor_matchers.rst	some more changes	2014-02-17 21:57:33 +04:00
drawing_function_of_keypoints_and_matches.rst	fixed docs	2014-02-05 10:49:56 +04:00
feature_detection_and_description.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-11 17:20:01 +04:00
features2d.rst	fixed ?? marks; fixed missing highlighting in some of the sections	2011-04-19 11:41:12 +00:00
object_categorization.rst	fixes2	2014-02-05 13:51:14 +04:00