diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:08:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:09:02 +0100 |
| commit | abfdf34f510b64439c85cc54f47b41c4ce3f9c61 (patch) | |
| tree | f6493d3f2bbf7fc9225feaaf9997d986cfd06471 /src/client/qwaylanddisplay.cpp | |
| parent | 6e4772bfb6a2818f05fe1bb8132f96d3f868e3d0 (diff) | |
| parent | 79cde9fba8452afba049f4fd611dfe9cf8f1be12 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I509ec9f1f76f7476885f520ae05d3d6f83996398
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
0 files changed, 0 insertions, 0 deletions