mirror of
https://github.com/opencv/opencv.git
synced 2026-07-25 13:23:02 +04:00
8a2de2ecca
Conflicts: samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp