Andrey Pavlenko 4fbd2ef87a Merge pull request #1290 from mbarnach:bow_desc		2014-01-21 19:22:47 +04:00
..
doc	Merge pull request #1290 from mbarnach:bow_desc	2014-01-21 19:22:47 +04:00
include/opencv2	Merge pull request #1290 from mbarnach:bow_desc	2014-01-21 19:22:47 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #1290 from mbarnach:bow_desc	2014-01-21 19:22:47 +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