Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 15 Oct 2021 13:35:03 +0000 (13:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 15 Oct 2021 13:35:03 +0000 (13:35 +0000)
commit31c40fa4ccc50fc4f65d97c729c72ef5d0c9a879
treeaabf92cbe4439b63e48aff5adf29c342f57dd8a1
parent39c3334147ec02761b117f180c9c4518be18d1fa
parentbd0732b1d03bcbc15d919d6dbe3dc45eac1b9514
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/cv_cpu_dispatch.h
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/highgui/CMakeLists.txt
modules/imgcodecs/CMakeLists.txt
samples/CMakeLists.txt