Roman Donchenko 9d8d70d6ca Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/definitions/tocDefinitions.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/features2d/src/freak.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_context.cpp modules/ocl/test/test_api.cpp		2013-12-16 15:02:12 +04:00
..
doc	War on Whitespace, master edition: trailing spaces.	2013-08-27 13:57:24 +04:00
include/opencv2	Named FastFeatureDetector::Type to allow its use in makePtr.	2013-10-01 18:22:03 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-16 15:02:12 +04:00
test	fixed warnings	2013-10-08 12:46:43 +04:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00