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

..

cl_d3d10.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_d3d11.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_dx9_media_sharing.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_egl.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_ext.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_gl_ext.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_gl.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl_platform.h

Use __vector instead of vector as suggests Eigen

2014-01-16 21:53:49 +01:00

cl.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00

cl.hpp

Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8

2014-01-13 16:09:42 +01:00

opencl.h

added Khronos OpenCL 1.2 header files

2013-10-18 15:44:55 +04:00