Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 Sep 2020 21:33:29 +0000 (21:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 Sep 2020 21:33:29 +0000 (21:33 +0000)
commit295afd58820c79e4cc9ee4f7c732943b74196ba4
treefd969681aa3dc7695e766a05a6aa35e273bc5706
parent8da1b9aafa33899559f75a3de7de1b7112cfe7a9
parent08b36e4f48060e4fb625eb05167f34b276bdc052
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVDetectCUDA.cmake
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_layers.cpp
modules/dnn/test/test_torch_importer.cpp
platforms/ios/build_framework.py