Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 Jan 2021 18:34:33 +0000 (18:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 Jan 2021 18:34:33 +0000 (18:34 +0000)
commitd3bc563c6e01c2bc153f23e7393322a95c7d3974
treef50490d2fd9e4b95e806ee569038e06faa570e57
parent941a9792f7c7d60640c82926091d710e6ecbfb55
parentfbcc532de51f835b298f09165bab96e58a01491b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
README.md
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.markdown
modules/dnn/src/tensorflow/tf_importer.cpp
modules/imgproc/include/opencv2/imgproc.hpp