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
..
opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-16 15:02:12 +04:00