diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:30:08 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:30:08 +0200 |
| commit | f4da6a3aed3e76ed6e187b59649d5bbec9b2098f (patch) | |
| tree | e4af5e8c4ab3f48dc284cc52ece08f14c2477186 | |
| parent | 1f50edbd81baa57f9508f76f4d6493eaa01d6610 (diff) | |
| parent | 15d01c8031386d9e7d2572cca7797f3ce63d2663 (diff) | |
| download | qtxmlpatterns-f4da6a3aed3e76ed6e187b59649d5bbec9b2098f.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Iaffc08b9bd62e43d866a60785b0a2e6ac3a46010
0 files changed, 0 insertions, 0 deletions