diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:56:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:56:56 +0100 |
| commit | e2d4b998db7b9f12d47f9ae83e411e4c66fdd49f (patch) | |
| tree | baa1608d572789503aaa08d1bded85419c591158 /LICENSE.LGPLv3 | |
| parent | 630906288d65705e2b66d1fbc07a478bf15d498f (diff) | |
| parent | 04e9f7f21a4c8faffdb342a141039096f00bb332 (diff) | |
| download | qtsvg-e2d4b998db7b9f12d47f9ae83e411e4c66fdd49f.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I6429aa789e022fedababb8ec6bca144f7ce8721f
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions