Andrey Kamaev 059b79f7c2 Merged the trunk r8542:8544		2012-06-01 10:59:27 +00:00
..
doc	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
include/opencv2/features2d	Merged the trunk r8542:8544	2012-06-01 10:59:27 +00:00
perf	lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.	2012-03-15 14:36:01 +00:00
src	Merged the trunk r8542:8544	2012-06-01 10:59:27 +00:00
test	Merged the trunk r8517:8524	2012-05-31 10:53:28 +00:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00