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 |
||
---|---|---|
.. | ||
15-puzzle | ||
camera-calibration | ||
color-blob-detection | ||
face-detection | ||
hello-android | ||
image-manipulations | ||
native-activity | ||
tutorial-1-camerapreview | ||
tutorial-2-mixedprocessing | ||
tutorial-3-cameracontrol | ||
.gitignore | ||
CMakeLists.txt |