Vadim Pisarevsky cc11a8d183 Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4 ... Conflicts: modules/features2d/src/orb.cpp		2014-10-17 15:13:35 +04:00
..
doc	fixed some more compile errors and test failures	2014-10-17 15:02:56 +04:00
include/opencv2	fixed some more compile errors and test failures	2014-10-17 15:02:56 +04:00
perf	all the tests now pass except for MSER	2014-10-17 14:56:58 +04:00
src	Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4	2014-10-17 15:13:35 +04:00
test	fixed some more compile errors and test failures	2014-10-17 15:02:56 +04:00
CMakeLists.txt	first version of moving KDTree from core to ml	2014-08-18 22:40:31 +04:00