diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
| commit | df015bd2e40e7654b2515996d5bd82469542581a (patch) | |
| tree | a36b7e9b2c9a7ccc1158d004c7b4a325200bb261 /src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro | |
| parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
| parent | 0e2a950895805457a45abe860bc91a7cc4ba405e (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
Change-Id: Ie45a13d3c866d0503e6e31b2a53b70f3420c5066
Diffstat (limited to 'src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro')
0 files changed, 0 insertions, 0 deletions