Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 19 Sep 2020 17:03:08 +0000 (17:03 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 19 Sep 2020 17:03:08 +0000 (17:03 +0000)
commitf52a2cf5e16c5545d8e6cc7bcb1571e4d3c2cddf
tree74e5c24b152dbda37fba04586bc5c1e6cdfe7f2b
parent95fd61c9b4c2cbe099f84740c35587e53d55b6bb
parent5e90802b1a46a07fb74be37cb0d715f174803819
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
cmake/OpenCVModule.cmake
modules/core/src/matrix_wrap.cpp
modules/core/src/ocl.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/imgcodecs/src/loadsave.cpp
modules/videoio/doc/videoio_overview.markdown