0c7663eb3b
Conflicts: modules/core/include/opencv2/core/cuda.hpp modules/cudacodec/src/thread.cpp modules/cudacodec/src/thread.hpp modules/superres/perf/perf_superres.cpp modules/superres/src/btv_l1_cuda.cpp modules/superres/src/optical_flow.cpp modules/videostab/src/global_motion.cpp modules/videostab/src/inpainting.cpp samples/cpp/stitching_detailed.cpp samples/cpp/videostab.cpp samples/gpu/stereo_multi.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 | ||