Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 28 Feb 2020 18:34:37 +0000 (18:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 28 Feb 2020 18:34:37 +0000 (18:34 +0000)
1  2 
cmake/OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core/mat.inl.hpp
modules/highgui/src/window_QT.cpp
modules/videoio/src/cap_v4l.cpp

Simple merge
Simple merge
Simple merge