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)
commitecfabd7aacd7938dbae7d9c6b5f593764d6d4935
tree9a04c3cf526ff0b93e7a2b0f9a9e7cb52b4e0a4e
parent13aef2c0cff94d241569844e02c3dbb3ac301330
parent371096493cc9908f49bb0f3d290a015b7cb02fac
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
modules/highgui/src/window_QT.cpp