Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst modules/features2d/doc/object_categorization.rst modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/image_filtering.rst modules/gpu/doc/image_processing.rst modules/gpu/doc/video.rst modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/object_detection.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/imgproc/src/samplers.cpp modules/ml/doc/k_nearest_neighbors.rst modules/nonfree/doc/feature_detection.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/photo/doc/inpainting.rst modules/ts/include/opencv2/ts.hpp platforms/scripts/camera_build.conf samples/android/camera-calibration/AndroidManifest.xml		2013-08-13 12:56:39 +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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +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	Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong	2013-08-07 14:49:33 +02:00
drawing_function_of_keypoints_and_matches.rst	feature2d drawing functions PyDocs	2013-07-11 09:31:25 +05:30
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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00