diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-05 10:00:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-05 10:00:11 +0100 |
| commit | 97e6ed74e4617de1abd1b64a3cdc7aa5559f2421 (patch) | |
| tree | cf7f2a5eca5747df3ebb96fc911f2f522121078c /qtwayland | |
| parent | 91191afe3fdccd6ec7b4bac3c18e058a812e046b (diff) | |
| parent | 2c27ccd1c9a821edd071cae6336ecb2066ce2ab7 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
.gitmodules
Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
Diffstat (limited to 'qtwayland')
0 files changed, 0 insertions, 0 deletions