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

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-16 15:02:12 +04:00

perf

core/ocl: added perf test infra + "Add" perf test

2013-12-03 18:43:50 +04:00

src

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-16 15:02:12 +04:00

test

Merge pull request #1981 from ilya-lavrenov:tapi_sqrt

2013-12-13 19:34:28 +04:00

CMakeLists.txt

core/ocl: update dynamic runtime

2013-12-11 15:56:54 +04:00