diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 17:14:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 17:14:42 +0200 |
| commit | bde71a7f9e8d2c64a8cbf703da01b6241b901371 (patch) | |
| tree | 3a862a47ebf09d74bb9ca2ea888ef3c36f62212f /sync.profile | |
| parent | 9497d364d7dd57a337936c8f627c0564599efb64 (diff) | |
| parent | 69c539045191d02a07ff3471bd37486ccf226b18 (diff) | |
| download | qtxmlpatterns-bde71a7f9e8d2c64a8cbf703da01b6241b901371.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: I56232f2e3996efa9804cfabae61db765629e060a
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions