Matthias Bady 67e2d7ec43 Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl		2014-01-18 10:38:07 +01:00
..
doc	moved documentation of BriefDescriptorExtractor to correct place	2013-12-20 10:57:48 +01:00
include/opencv2	Merge pull request #1881 from pentschev:defaultNorm_master	2013-12-17 13:53:59 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-14 11:53:59 +04:00
test	DescriptorExtractor: added defaultNorm() to return default norm type.	2013-12-09 09:54:42 -02:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00