opencv/modules/features2d/include/opencv2
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
..
features2d War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
features2d.hpp Merge branch 'master' of https://github.com/Itseez/opencv 2014-03-06 15:39:06 -08:00