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
..
features2d	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
features2d.hpp	Merge remote-tracking branch 'upstream/master' into bow_desc	2013-11-24 14:21:44 +01:00