Roman Donchenko 4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt

2013-10-22 14:28:00 +04:00

..

images

Update the OpenCL documents.

2013-09-26 14:04:11 +08:00

camera_calibration_and_3D_reconstruction.rst

Update the OpenCL documents.

2013-09-26 14:04:11 +08:00

data_structures.rst

Normalized file endings.

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

feature_detection_and_description.rst

Update the OpenCL documents.

2013-09-26 14:04:11 +08:00

image_filtering.rst

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

2013-10-22 14:28:00 +04:00

image_processing.rst

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

introduction.rst

Deleted all trailing whitespace.

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

matrix_reductions.rst

documentation update for ocl::min and ocl::max

2013-10-08 15:23:18 +02:00

ml_machine_learning.rst

fix three warning about mog, mog2 and KNearestNeighbour.

2013-09-26 15:30:44 +08:00

object_detection.rst

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

ocl.rst

Update the OpenCL documents.

2013-09-26 14:04:11 +08:00

operations_on_matrices.rst

fix documentation warning

2013-10-08 16:49:20 +02:00

structures_and_utility_functions.rst

ocl: update module documentation

2013-10-03 23:26:06 +04:00

video_analysis.rst

fix three warning about mog, mog2 and KNearestNeighbour.

2013-09-26 15:30:44 +08:00