2c4bbb313c
Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVLegacyOptions.cmake modules/contrib/src/retina.cpp modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/video.rst modules/gpu/src/speckle_filtering.cpp modules/python/src2/cv2.cv.hpp modules/python/test/test2.py samples/python/watershed.py |
||
|---|---|---|
| .. | ||
| 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 | ||