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

..

dshow

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

ffmpeg_

Updated build of ffmpeg library (v 2.0.2). Builded with mingw (gcc 4.6.1) with

2013-10-17 12:29:00 +04:00

opencl/1.2/CL

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-20 15:10:19 +04:00

msc_inttypes.h

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

msc_stdint.h

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00