Mathieu Barnachon 67525627db Merge remote-tracking branch 'upstream/master' into bow_desc ...

Conflicts:
	modules/features2d/src/bagofwords.cpp

2013-11-24 14:21:44 +01: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

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

feature_detection_and_description.rst

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +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 'upstream/master' into bow_desc

2013-11-24 14:21:44 +01:00