opencv/modules/features2d/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
..
common_interfaces_of_descriptor_extractors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
common_interfaces_of_descriptor_matchers.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
common_interfaces_of_feature_detectors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
common_interfaces_of_generic_descriptor_matchers.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
drawing_function_of_keypoints_and_matches.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
feature_detection_and_description.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
features2d.rst fixed ?? marks; fixed missing highlighting in some of the sections 2011-04-19 11:41:12 +00:00
object_categorization.rst Normalized file endings. 2013-08-21 18:59:25 +04:00