diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:06:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:06:31 +0100 |
| commit | 4d195d9b01bfb276e5e49a9cc3a0480936f41e58 (patch) | |
| tree | ac6d90e38c434bb61c53c8db33ce95b6aace1396 | |
| parent | 5324398a688cd151b9532f5268a7d768a0ec7aee (diff) | |
| parent | faee667a53bfc22a7177ceb8c0d68b4df710f317 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
.qmake.conf
Change-Id: I82ed55a0ffb844ce8f467963dca883f3d3ef2337
0 files changed, 0 insertions, 0 deletions