mirror of https://github.com/opencv/opencv.git
Conflicts: modules/highgui/doc/reading_and_writing_images_and_video.rst modules/highgui/src/cap_dc1394_v2.cpppull/4063/head
parent
8454a8f2d1
commit
83723c15be
1 changed files with 2 additions and 0 deletions
Loading…
Reference in new issue