diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:23:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:23:31 +0200 |
| commit | 5598cebd35157890af20fa824fc9f1c92340270c (patch) | |
| tree | 348dbd4197e9ba9ee38752b57f2314f178af3f5d | |
| parent | b5f694db98573d06bab68dfdb12f0c83bc291bd2 (diff) | |
| parent | ec301681e4e2f5b293435ec7cf295350ee5acb18 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I539e7abf49a6b14c31bf1c8ca440afcdbfb5164e
0 files changed, 0 insertions, 0 deletions