Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
..
2013-09-02 14:00:44 +04:00
2013-09-02 14:00:44 +04:00
2013-12-30 17:30:59 +04:00
2013-09-04 09:58:32 +04:00
2014-02-17 15:24:05 +04:00
2013-12-03 17:35:21 +04:00