opencv

History

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.