Roman Donchenko 40a740ff88 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/imgproc/src/opencl/precornerdetect.cl
	modules/nonfree/perf/perf_main.cpp
	modules/nonfree/perf/perf_surf.ocl.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/opencl/arithm_bitwise.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_minMax.cl
	modules/ocl/src/opencl/arithm_nonzero.cl
	modules/ocl/src/opencl/arithm_sum.cl
	modules/ocl/test/test_arithm.cpp
	modules/viz/src/precomp.hpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkXYZReader.cpp
	modules/viz/src/vtk/vtkXYZReader.h
	modules/viz/test/test_precomp.hpp

2014-03-17 14:14:07 +04:00

..

doc

Fix warnings from documentation build

2013-02-20 15:07:13 +04:00

include/opencv2

Build fixes for GPU module.

2013-12-19 19:12:18 +04:00

src

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

2014-03-17 14:14:07 +04:00

CMakeLists.txt

Code review fixes.

2013-12-23 11:34:46 +04:00