opencv/modules/legacy/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 moved planar subdiv docs to legacy; added Input/OutputArray docs to core 2012-04-28 12:59:21 +00:00
common_interfaces_of_descriptor_extractors.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
common_interfaces_of_generic_descriptor_matchers.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
expectation_maximization.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
feature_detection_and_description.rst Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 2013-08-07 14:49:33 +02:00
histograms.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
legacy.rst Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes) 2012-05-30 11:13:07 +00:00
motion_analysis.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
planar_subdivisions.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00