Roman Donchenko 1312eca220 Merge commit '0566ab4d3d' into merge-2.4 ...

Conflicts:
	modules/core/src/system.cpp

2013-12-30 16:51:46 +04:00

..

doc

Merge pull request #2034 from pentschev:ocl_features2d_orb_master

2013-12-27 15:49:28 +04:00

include/opencv2

Merge pull request #2034 from pentschev:ocl_features2d_orb_master

2013-12-27 15:49:28 +04:00

perf

Merge pull request #2034 from pentschev:ocl_features2d_orb_master

2013-12-27 15:49:28 +04:00

src

Merge commit '0566ab4d3d' into merge-2.4

2013-12-30 16:51:46 +04:00

test

Merge pull request #2034 from pentschev:ocl_features2d_orb_master

2013-12-27 15:49:28 +04:00

CMakeLists.txt

ocl: add support for initialization from user-provided OpenCL handles

2013-12-12 19:59:22 +04:00