Andrey Kamaev 7b5a45eac4 Merged the trunk r8384:8407 (inclusive)		2012-05-30 08:04:37 +00:00
..
doc	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
include/opencv2/contrib	modified EM interface; updated tests & samples	2012-04-06 15:59:30 +00:00
src	Merged the trunk r8384:8407 (inclusive)	2012-05-30 08:04:37 +00:00
test	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
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00