Andrey Kamaev 61079547f0 Merge branch '2.4'		2013-02-01 14:59:40 +04:00
..
doc	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
include/opencv2/features2d	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
perf	Merge branch 2.4	2012-12-24 17:10:07 +04:00
src	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
test	Merge branch '2.4'	2013-02-01 14:59:40 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00