sprice 75ed2f52f1 Merge branch 'master' of https://github.com/Itseez/opencv ... Conflicts: modules/features2d/include/opencv2/features2d.hpp modules/features2d/src/freak.cpp modules/features2d/src/stardetector.cpp		2014-03-06 15:39:06 -08:00
..
doc	some more changes	2014-02-17 21:57:33 +04:00
include/opencv2	Merge branch 'master' of https://github.com/Itseez/opencv	2014-03-06 15:39:06 -08:00
perf	added perf test	2014-01-23 07:51:19 +04:00
src	Merge branch 'master' of https://github.com/Itseez/opencv	2014-03-06 15:39:06 -08:00
test	BFMatcher	2014-01-22 15:31:26 +04:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00