Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 21 Jul 2019 18:06:04 +0000 (18:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sun, 21 Jul 2019 18:06:04 +0000 (18:06 +0000)
commit426482e05b9db0e891539d01177dc5be120af370
tree511d0c579065761c9ff858b45b2ee889967c99eb
parent3361c595763ac72aef73a038849558a226629c4c
parentad092bf1ce369cd5d7311cfeebb9fb3ff4d0640b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/dnn.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/js/src/embindgen.py
modules/videoio/src/cap_gstreamer.cpp
modules/videoio/test/test_video_io.cpp