Roman Donchenko e45fd939c2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/cl_runtime/clamdblas_runtime.cpp modules/ocl/src/cl_runtime/clamdfft_runtime.cpp modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in		2014-01-20 15:10:19 +04:00
..
doc	Merge pull request #2034 from pentschev:ocl_features2d_orb_master	2013-12-27 15:49:28 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-14 11:53:59 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-20 15:10:19 +04:00
src	Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8	2014-01-13 16:09:42 +01:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-14 11:53:59 +04:00
CMakeLists.txt	ocl: add support for initialization from user-provided OpenCL handles	2013-12-12 19:59:22 +04:00