diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-05 07:48:33 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-11-05 11:35:46 +0100 |
| commit | b990f98b44ced37a319d7f476fad7bfb3e070be0 (patch) | |
| tree | 171a797b6e82a9433e047de7a2ffe475e544a1e8 /LICENSE.FDL | |
| parent | d4ac2c9915fed87193cd2cf7ac438a9fa8edc126 (diff) | |
| parent | 09474cdf5244ce6fba51a6b01bfe50caf7635c66 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/client/qwaylanddisplay.cpp
src/client/qwaylandwindow.cpp
Change-Id: I30ddf5305b3087b93cf4d6e562fd0146dea61cc0
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions