Commit b11fb781 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

parents 40b238b0 11099062

modules/aruco/tutorials/aruco_detection/aruco_detection.markdown

+302 −270

File changed.

Preview size limit exceeded, changes collapsed.

modules/aruco/tutorials/aruco_detection/images/bitsextraction1.png

−4.32 KiB (5.43 KiB)
Loading image diff...

modules/aruco/tutorials/aruco_detection/images/marker23.jpg

deleted100644 → 0
−1.14 KiB
Loading image diff...

modules/aruco/tutorials/aruco_detection/images/marker23.png

0 → 100644
+1.19 KiB
Loading image diff...

modules/aruco/tutorials/aruco_detection/images/markers.jpg

100644 → 100755
(15.9 KiB)

File mode changed from 100644 to 100755.

View file