diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:04:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:04:21 +0200 |
| commit | f87e9e28aaa37888baa3c530d74c61f8c5826ef1 (patch) | |
| tree | c7142c4a4daf08272b927ea91ded4adb4f05e2bc | |
| parent | f15384fea6f638bcfeab5c6a19b85e958ce7f917 (diff) | |
| parent | 182488129c3f6a67a7e781fdb7c0147777191991 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: Iafa184859c6610a39f4251e6ca59d0863eed3ae0
0 files changed, 0 insertions, 0 deletions