Andrey Kamaev bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings		2012-06-15 13:04:17 +00:00
..
doc	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
include/opencv2/nonfree	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
perf	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
src	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
test	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
CMakeLists.txt	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