Andrey Kamaev 8fdab9f631 Merge branch '2.4'		2013-04-17 12:07:17 +04:00
..
perf_inpaint.cpp	Eliminate the need of ::testsing::ValuesIn() for CV_ENUM	2013-04-15 19:39:49 +04:00
perf_main.cpp	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
perf_precomp.cpp	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
perf_precomp.hpp	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00