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 |
||
|---|---|---|
| .. | ||
| common_interfaces_of_descriptor_extractors.rst | ||
| common_interfaces_of_descriptor_matchers.rst | ||
| common_interfaces_of_feature_detectors.rst | ||
| common_interfaces_of_generic_descriptor_matchers.rst | ||
| drawing_function_of_keypoints_and_matches.rst | ||
| feature_detection_and_description.rst | ||
| features2d.rst | ||
| object_categorization.rst | ||