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 |
||
|---|---|---|
| .. | ||
| calib3d.rst | ||
| data_structures.rst | ||
| gpu.rst | ||
| initalization_and_information.rst | ||
| introduction.rst | ||
| object_detection.rst | ||