diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:49:01 +0100 |
| commit | ae4f854d754ea189be13ef740d631fdb7a72c9a5 (patch) | |
| tree | 7ddef04e125543f40d15b7a15202c9307ff1c009 /dist/changes-5.6.0 | |
| parent | b5f423f50a67d7e1ff416e4348517332d46f780f (diff) | |
| parent | 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I67661e95e931fd7c6992f8f1769c50472c5e5f15
Diffstat (limited to 'dist/changes-5.6.0')
0 files changed, 0 insertions, 0 deletions