Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Nov 2021 15:11:30 +0000 (15:11 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Nov 2021 15:11:30 +0000 (15:11 +0000)
1  2 
modules/core/src/system.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_caffe_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/hough.cpp

Simple merge
Simple merge
Simple merge