Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 20 Jan 2014 11:10:19 +0000 (15:10 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 20 Jan 2014 11:10:19 +0000 (15:10 +0400)
commite45fd939c25b29a1c3e8c28b724cce5b5e3727d8
tree46180170ee9924d33e29abd1d2ba8d2ddaccb0ce
parent8386ce2b2f9023c7ba240ed97b46220877aeaa7c
parent088535fa565365c68c8fde20a66616b9880f3721
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
modules/core/src/copy.cpp
modules/core/src/opencl/runtime/opencl_clamdblas.cpp
modules/core/src/opencl/runtime/opencl_clamdfft.cpp
modules/core/src/opencl/runtime/opencl_core.cpp
modules/core/test/test_mat.cpp
modules/imgproc/doc/miscellaneous_transformations.rst
modules/ml/src/svm.cpp
modules/ocl/perf/perf_haar.cpp