Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 21 Aug 2021 17:25:18 +0000 (17:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 21 Aug 2021 17:25:18 +0000 (17:25 +0000)
commit6fbfc58602e719b9d58099a3c43e5c764718c4ba
tree7e0408031f6a55b15efecf9ccc145d70467ee941
parent6801dd043de53030a6f8e36893580951a20dd842
parent77a5c43d50eedacc8a8916c72a004d093b6b957d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/python/common.cmake