Marina Kolpakova 162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811		2012-06-28 17:07:17 +00:00
..
doc	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
include/opencv2/features2d	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
perf	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
src	added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)	2012-06-28 16:46:29 +00:00
test	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00