diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:24:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:24:07 +0200 |
| commit | 9a3807656e2d917acf271bb16f4e296136e52d1d (patch) | |
| tree | 49885a33e75d028e1a27b402bfa01a44c9b94567 | |
| parent | cd5089723b4f0795092bafa2987a89add09fe258 (diff) | |
| parent | ba0708a75784a92aee9523b7ee925ece18c69812 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I70e0e7aa8d1a6146ff5b18b3a38131714a45d67b
0 files changed, 0 insertions, 0 deletions