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 commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-26 15:05:26 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-20 15:10:19 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-20 15:10:19 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00