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
..
2013-08-27 13:26:44 +04:00
2012-06-09 15:00:04 +00:00
2011-02-09 20:55:11 +00:00
2013-04-01 15:24:32 +04:00
2012-10-17 15:32:23 +04:00
2013-03-20 17:56:06 +04:00
2014-01-13 13:50:30 +04:00