Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Dec 2019 21:30:30 +0000 (21:30 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 16 Dec 2019 21:30:30 +0000 (21:30 +0000)
commitc6c8783c60a5d6dc4dd3df35e0b09a8c38b0cd7f
tree7e185aab1d0edf269af78f89d02badbc4c3705af
parenta11f9e196390dcf88466f6ae470ffd1f900bef85
parent971ae00942329f71a6b76fe24278c39c51301eee
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/parallel.cpp
modules/highgui/CMakeLists.txt
modules/highgui/src/window_w32.cpp