diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:34 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:34 +0200 |
| commit | 48708a6adeba271d5f14a03639159fabb3a30c2b (patch) | |
| tree | 40a2f2dc19cefb3028c5b7cf789b932752fb62e1 | |
| parent | 33cc78b8f933a697c5bc6924a55f3a9cfa8b1e56 (diff) | |
| parent | 78c2367e22d87b529610117f5b6abef6934abdcf (diff) | |
| download | qtxmlpatterns-48708a6adeba271d5f14a03639159fabb3a30c2b.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac
0 files changed, 0 insertions, 0 deletions