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)
commit333a767be456d8ce13848b64f8ccd8352af9cfe2
tree1c74742b929d9699ee215147b2f93e52df6d63cb
parentdb5f1c35540df1ed0771571a321c249edf0e347f
parent5012fc5d23eba9d6e75a521ea01f096f7b7d4c9d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core/mat.inl.hpp
modules/highgui/src/window_QT.cpp
modules/videoio/src/cap_v4l.cpp