opencv

History

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

pics

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

basic_structures.rst

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

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

clustering.rst

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

command_line_parser.rst

War on Whitespace, master edition: file endings.