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	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-17 14:14:07 +04:00
include/opencv2	Merge pull request #2459 from ilya-lavrenov:tapi_experiments	2014-03-13 16:49:57 +04:00
perf	Merge pull request #2470 from ilya-lavrenov:tapi_reduction	2014-03-13 18:42:01 +04:00
src	fix for unsupported doubles	2014-03-14 16:54:52 +04:00
test	test for clEnqueueReadBufferRect	2014-03-06 12:11:46 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00