Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Feb 2014 10:35:34 +0000 (14:35 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 25 Feb 2014 11:02:24 +0000 (15:02 +0400)
commit48432502b6fe166242a25e1f9cc1d7215a72c1bb
tree4bf0b98ea76f70491eea922f1261af728d729aba
parent0a90d6dde6cedcc98c1f5663798ffde32831d864
parent2b0c3eb17086c10c0ccd04adc03d915f94bf3287
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
26 files changed:
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVDetectCUDA.cmake
doc/conf.py
doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
doc/tutorials/introduction/load_save_image/load_save_image.rst
modules/core/CMakeLists.txt
modules/core/doc/basic_structures.rst
modules/core/perf/opencl/perf_bufferpool.cpp
modules/core/perf/opencl/perf_usage_flags.cpp
modules/cudaimgproc/src/cuda/canny.cu
modules/highgui/src/grfmt_tiff.cpp
modules/highgui/test/test_grfmt.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/color.cpp
modules/imgproc/src/floodfill.cpp
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/moments.cpp
modules/imgproc/test/test_convhull.cpp
modules/legacy/src/bgfg_gaussmix.cpp
modules/nonfree/CMakeLists.txt
modules/photo/src/cuda/nlm.cu
modules/superres/CMakeLists.txt
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/ts_arrtest.cpp