Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Feb 2014 11:24:05 +0000 (15:24 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Feb 2014 11:24:05 +0000 (15:24 +0400)
commit029ffb7c2d3916958404d4ebe7ed87c0d4444e6e
treeb50937b4acbbef9417efcb75009dc7d0c93185fb
parenta0bb74a086d33a57509d147fccfdb3abd28b37dc
parentb6dafed5ba920ec804b5ee93809a47c7099e8820
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
12 files changed:
CMakeLists.txt
cmake/OpenCVModule.cmake
cmake/templates/cvconfig.h.in
modules/contrib/src/rgbdodometry.cpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/gl_core_3_1.cpp
modules/cudaimgproc/perf/perf_color.cpp
modules/cudaimgproc/src/cuda/canny.cu
modules/cudaoptflow/test/test_optflow.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/test/test_grfmt.cpp
modules/photo/test/test_denoising.cuda.cpp