5 Commits

Include renames

Author	SHA1	Message	Date
Maria Dimashova	52ba2e45c4	removed obsolete parameter 'time' in regression test for descriptors	2012-07-02 12:44:41 +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	846e37ded5	fixed many warnings from GCC 4.6.1	2012-03-17 09:22:31 +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