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
..
2012-08-30 00:23:45 +04:00
2014-02-13 22:59:30 +11:00
2012-08-30 00:23:45 +04:00
2012-02-29 15:01:28 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2014-02-14 16:16:17 +11:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2010-07-16 12:54:53 +00:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-10-17 15:32:23 +04:00
2012-08-30 00:23:45 +04:00
2012-10-17 15:32:23 +04:00