Andrey Kamaev 088a6597bc Merged the trunk 8855,8885,8886		2012-07-02 12:05:06 +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	Merged the trunk r8852:8880	2012-07-02 11:04:43 +00:00
test	Merged the trunk 8855,8885,8886	2012-07-02 12:05:06 +00:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00