• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · e45fd939
    Roman Donchenko authored
    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
    e45fd939
Name
Last commit
Last update
..
cl.h Loading commit data...
cl.hpp Loading commit data...
cl_d3d10.h Loading commit data...
cl_d3d11.h Loading commit data...
cl_dx9_media_sharing.h Loading commit data...
cl_egl.h Loading commit data...
cl_ext.h Loading commit data...
cl_gl.h Loading commit data...
cl_gl_ext.h Loading commit data...
cl_platform.h Loading commit data...
opencl.h Loading commit data...