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

..

adding_images

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-03-24 19:02:16 +04:00

basic_geometric_drawing

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

basic_linear_transform

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

discrete_fourier_transform

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

file_input_output_with_xml_yml

Normalized file endings.

2013-08-21 18:59:25 +04:00

how_to_scan_images

I have changed one sentence in tutorial, making it more understandable

2014-03-18 08:59:53 +01:00

interoperability_with_OpenCV_1

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

mat_the_basic_image_container

remove highlighting in some function links

2014-03-21 11:54:35 +01:00

mat-mask-operations

Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.

2014-03-24 12:53:30 +04:00

random_generator_and_text

svn repository web references are replaced with links to git

2012-08-07 14:30:36 +04:00

table_of_content_core

Normalized file endings.

2013-08-21 18:59:25 +04:00