opencv/modules/imgproc/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
..
pics fixed bayer pattern picture in cvtColor() description; corrected formula in getGaussianKernel() 2011-06-14 10:26:24 +00:00
feature_detection.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
filtering.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
geometric_transformations.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
histograms.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
imgproc.rst merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
motion_analysis_and_object_tracking.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
object_detection.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00