Skip to content

Commit a2117ed

Browse files
committed
Merge remote-tracking branch 'origin/5.x' into features2d_parts_to_contrib
2 parents b7caeff + 02a72d1 commit a2117ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+0
-5842
lines changed

Diff for: modules/aruco/CMakeLists.txt

-4
This file was deleted.

Diff for: modules/aruco/README.md

-17
This file was deleted.

Diff for: modules/aruco/doc/aruco.bib

-21
This file was deleted.

Diff for: modules/aruco/include/opencv2/aruco.hpp

-102
This file was deleted.

Diff for: modules/aruco/include/opencv2/aruco/aruco_calib.hpp

-173
This file was deleted.

0 commit comments

Comments
 (0)