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 |
||
|---|---|---|
| .. | ||
| pics | ||
| common_interfaces_of_descriptor_extractors.rst | ||
| common_interfaces_of_generic_descriptor_matchers.rst | ||
| expectation_maximization.rst | ||
| feature_detection_and_description.rst | ||
| histograms.rst | ||
| legacy.rst | ||
| motion_analysis.rst | ||
| planar_subdivisions.rst | ||