Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp		2013-12-23 18:50:17 +04:00
..
images	Update the OpenCL documents.	2013-09-26 14:04:11 +08:00
camera_calibration_and_3D_reconstruction.rst	ocl: update documentation	2013-11-05 23:53:51 +04:00
data_structures.rst	Removing ocl::oclMat::ptr() method.	2013-12-06 09:31:18 -02:00
feature_detection_and_description.rst	OCL: including FAST feature detector.	2013-12-11 21:23:27 -02:00
image_filtering.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
image_processing.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-19 16:21:09 +04:00
introduction.rst	ocl: update documentation	2013-11-05 23:53:51 +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	speeded up ocl::distanceToCenters	2013-11-06 20:02:31 +04: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	OCL: included sqrt matrix operation.	2013-12-12 08:57:27 -02:00
structures_and_utility_functions.rst	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00
video_analysis.rst	Added a citation which used to be in the gpu module in 2.4.	2013-11-11 18:00:55 +04:00