Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse...
authorAlexandr Kondratev <theg4sh@gmail.com>
Thu, 21 Jul 2016 15:16:41 +0000 (18:16 +0300)
committerAlexandr Kondratev <theg4sh@gmail.com>
Thu, 21 Jul 2016 15:16:41 +0000 (18:16 +0300)
1  2 
modules/highgui/src/window_QT.cpp

Simple merge