• 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
..
dshow Loading commit data...
ffmpeg_ Loading commit data...
opencl/1.2/CL Loading commit data...
msc_inttypes.h Loading commit data...
msc_stdint.h Loading commit data...