Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 6 May 2020 19:52:58 +0000 (19:52 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 6 May 2020 19:53:51 +0000 (19:53 +0000)
commit09799402f912dc4c08b759ff628842cd160756ce
tree3dfee6387335a326c9ee7c1ffaa48242640a2b2d
parentc722625f280258f5c865002899bf0dc2ebff1b2b
parent5813d2439c44ebe75e98ff14a88c6784d79ddf83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/layers/region_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/video/src/lkpyramid.cpp