Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 11 Nov 2019 18:24:05 +0000 (18:24 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 11 Nov 2019 20:25:42 +0000 (20:25 +0000)
commitb6a58818bb6b30a1f9d982b3f3f53228ea5a13c1
treee5d8f9f9c8465bd0a3000e58661b248f0088839a
parent5dd3e6052ed9e614cf4303eee64d092fefbabd8e
parentba58bba4e87d694e34d96b4264ac51f1c51fe1f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVModule.cmake
cmake/OpenCVUtils.cmake
modules/core/CMakeLists.txt
modules/core/src/ocl.cpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/eltwise_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_misc.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/videoio/src/cap_gstreamer.cpp