Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 9 Apr 2020 19:19:20 +0000 (19:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 9 Apr 2020 19:19:20 +0000 (19:19 +0000)
1  2 
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp

Simple merge