opencv/modules/ocl/doc
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
data_structures.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
feature_detection_and_description.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
image_filtering.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
image_processing.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
introduction.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
matrix_reductions.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
object_detection.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
ocl.rst fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
operations_on_matrices.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
structures_and_utility_functions.rst Normalized file endings. 2013-08-21 18:59:25 +04:00