mirror of
https://github.com/opencv/opencv.git
synced 2024-11-25 11:40:44 +08:00
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 |
||
|---|---|---|
| .. | ||
| test_drawing.cpp | ||
| test_ffmpeg.cpp | ||
| test_fourcc.cpp | ||
| test_framecount.cpp | ||
| test_grfmt.cpp | ||
| test_gui.cpp | ||
| test_main.cpp | ||
| test_positioning.cpp | ||
| test_precomp.hpp | ||
| test_video_io.cpp | ||
| test_video_pos.cpp | ||