Andrey Kamaev bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings		2012-06-15 13:04:17 +00:00
..
doc	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
include/opencv2/features2d	Merged the trunk r8542:8544	2012-06-01 10:59:27 +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 r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
test	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00