mirror of https://github.com/opencv/opencv.git
Conflicts: modules/highgui/include/opencv2/highgui/highgui_c.h modules/highgui/src/cap_dc1394_v2.cpp fix typopull/4063/head
parent
6aedd4f7b0
commit
8454a8f2d1
2 changed files with 7 additions and 0 deletions
Loading…
Reference in new issue