5 Commits

Author	SHA1	Message	Date
Andrey Kamaev	3a1f85d4e8	Remerged the 2.4.0 branch	2012-05-02 20:20:14 +00:00
Vadim Pisarevsky	d5a0088bbe	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
Vadim Pisarevsky	beb7fc3c92	a LOT of obsolete stuff has been moved to the legacy module.	2012-03-30 12:19:25 +00:00
Vadim Pisarevsky	957e80abbd	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