Andrey Kamaev 949c4edf41 Merged the trunk r8408:8457 (inclusive)		2012-05-30 08:47:34 +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	Merged the trunk r8408:8457 (inclusive)	2012-05-30 08:47:34 +00:00
src	Merged the trunk r8408:8457 (inclusive)	2012-05-30 08:47:34 +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