Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp		2013-07-08 18:47:38 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4'	2013-06-19 15:25:37 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-08 18:47:38 +04:00
perf	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
src	Merge pull request #696 from znah:detect_method	2013-06-13 12:01:59 +04:00
test	Move border type constants and Moments class to core module	2013-04-10 19:14:24 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00