Merge branch '3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 22 Dec 2018 05:40:15 +0000 (05:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 22 Dec 2018 05:40:15 +0000 (05:40 +0000)
commit1dee705074bb68fde68058a92b59235ffb34660c
tree0e5dc733c65c9aa97303afc919559a03984d5bd4
parent578ea4bae9e4b8d6443cddb3aae1595e9cccac70
parentc0e11bb50e0688a76e6122fcd67450a867b0fa05
Merge branch '3.4' into merge-3.4
12 files changed:
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/include/opencv2/dnn/version.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/src/torch/torch_importer.cpp
modules/dnn/test/test_backends.cpp
modules/imgproc/src/filter.cpp
modules/imgproc/src/median_blur.cpp
modules/imgproc/test/test_filter.cpp
modules/objdetect/src/qrcode.cpp
modules/videoio/src/cap_v4l.cpp
modules/videoio/test/test_camera.cpp