6 Commits

Author	SHA1	Message	Date
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +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
Alexey Spizhevoy	2bdd395357	Added the first version of the stitching module docs	2012-01-18 13:43:34 +00:00
Vadim Pisarevsky	3f0c17b592	re-added the opencv_flann documentation	2011-07-08 16:14:13 +00:00
Vadim Pisarevsky	b204e73d9a	propagated some more fixes from 2.3 branch to the trunk	2011-06-29 22:06:42 +00:00
Vadim Pisarevsky	b699e946b5	converted user guide & tutorials from tex to rst; added them into the whole documentation tree; added html_docs target.	2011-05-10 22:09:07 +00:00