Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 19:06:03 +0000 (19:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jul 2016 19:06:03 +0000 (19:06 +0000)
1  2 
modules/highgui/src/window_QT.cpp

Simple merge