Andrey Kamaev 891d7da6ee Merge branch '2.4'		2013-02-28 11:17:06 +04:00
..
doc	Fix documentation problems found by check_docs2 script	2013-02-20 15:07:13 +04:00
include/opencv2/features2d	Merge branch '2.4'	2013-02-28 11:17:06 +04:00
perf	Remove all using directives for STL namespace and members	2013-02-25 15:04:17 +04:00
src	Merge branch '2.4'	2013-02-28 11:17:06 +04:00
test	Remove all using directives for STL namespace and members	2013-02-25 15:04:17 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00