diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:48:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:48:28 +0200 |
| commit | e99dae74353e5652794d7bcbcd3d79b1478debbc (patch) | |
| tree | 6d0ab88f8aa6f464e66429899418f1adf63b0651 /src/client/qwaylandshmbackingstore.cpp | |
| parent | e3feecfd96d8fcd65556d325c806153a3495d5b3 (diff) | |
| parent | 7f70da6a644bc5b690066f0ab4814e1358f57e81 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ia0f9d099e92a40cae7ec506781f70c56415bcf89
Diffstat (limited to 'src/client/qwaylandshmbackingstore.cpp')
0 files changed, 0 insertions, 0 deletions