mirror of
https://github.com/opencv/opencv.git
synced 2026-07-27 06:13:05 +04:00
65389e41db
Conflicts: modules/java/generator/src/cpp/VideoCapture.cpp