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)
commit394e640909d5d8edf9c1f578f8216d513373698c
tree6c9681fd4fdc70715f8074470c93428db40babe4
parentb48eb4e88bbb03b654ee80dbb94b1bf4db9ca190
parent8041ab8a6132bd5f29fc9bd9514cce7695cb978d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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