Roman Donchenko feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/initialization.cpp modules/ocl/test/main.cpp modules/superres/CMakeLists.txt modules/superres/src/input_array_utility.cpp modules/superres/src/input_array_utility.hpp modules/superres/src/optical_flow.cpp		2013-07-16 11:52:41 +04:00
..
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-16 11:52:41 +04:00
misc	xls-report.py: Added an option to show per-pixel times	2013-07-10 14:58:51 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-07-03 19:53:21 +04:00
CMakeLists.txt	Move cv::KeyPoint and cv::DMatch to core	2013-03-26 16:08:43 +04:00