Merge pull request #13264 from mshabunin:fix-windows
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Nov 2018 20:00:04 +0000 (20:00 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 28 Nov 2018 20:00:04 +0000 (20:00 +0000)
1  2 
modules/highgui/src/precomp.hpp
modules/highgui/src/window_w32.cpp

Simple merge
Simple merge