Andrey Kamaev 67073daf19 Merge branch '2.4'		2013-04-05 21:11:59 +04:00
..
doc	Merge branch '2.4'	2013-04-05 21:11:59 +04:00
include/opencv2	Completely separate C and C++ API of OpenCV core	2013-04-01 15:24:34 +04:00
perf	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
src	Merge branch '2.4'	2013-04-05 21:11:59 +04:00
test	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00