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

..

doc

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

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

include/opencv2

Merge commit '1acc1085d' into merge-2.4

2013-12-30 16:37:39 +04:00

perf

Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:30 +04:00

src

warnings

2014-01-19 04:07:24 +04:00

test

Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:30 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00