Pierre Moulon 901d4995e3 Fix a typo error ... Fix a typo error Conflicts: modules/features2d/include/opencv2/features2d.hpp		2015-04-25 15:07:17 +02:00
..
features2d	Fix a typo error	2015-04-25 15:07:17 +02:00
features2d.hpp	Some changes to make migration to 3.0 easier	2014-12-16 13:00:31 +03:00