Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 4 Jul 2019 15:44:13 +0000 (18:44 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 4 Jul 2019 15:44:13 +0000 (18:44 +0300)
1  2 
CMakeLists.txt
modules/calib3d/src/undistort.avx2.cpp
modules/calib3d/test/test_undistort.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/ts/src/ts.cpp
modules/videoio/src/cap_gstreamer.cpp

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge