Andrey Kamaev f4e27bcbbc Merge branch '2.4'		2013-01-25 16:30:36 +04:00
..
doc	Merge branch 2.4	2013-01-17 18:39:20 +04:00
include/opencv2/features2d	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
perf	Merge branch 2.4	2012-12-24 17:10:07 +04:00
src	Merge branch '2.4'	2013-01-25 16:30:36 +04:00
test	Merge branch 2.4	2012-11-13 19:54:48 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00