029ffb7c2d
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 |
||
|---|---|---|
| .. | ||
| cmake_uninstall.cmake.in | ||
| cvconfig.h.in | ||
| opencv_modules.hpp.in | ||
| opencv_run_all_tests_android.sh.in | ||
| opencv_run_all_tests_unix.sh.in | ||
| opencv_testing.sh.in | ||
| opencv-XXX.pc.in | ||
| OpenCV.mk.in | ||
| OpenCVConfig-version.cmake.in | ||
| OpenCVConfig.cmake.in | ||