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
..
pics	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
basic_structures.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
clustering.rst	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
command_line_parser.rst	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
core.rst	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
drawing_functions.rst	fixed docs	2014-02-05 10:49:56 +04:00
dynamic_structures.rst	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
intro.rst	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
old_basic_structures.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04:00
old_xml_yaml_persistence.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
opengl_interop.rst	Merge branch 'master' into gpu-cuda-rename	2013-09-09 12:57:35 +04:00
operations_on_arrays.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
utility_and_system_functions_and_macros.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
xml_yaml_persistence.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00