diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:40:21 +0200 |
| commit | e79c376b723f04318c00af6ac09761ab307b1ca4 (patch) | |
| tree | be84ebd850f701847a94ec670f8059c3fe1aa972 /LICENSE.GPL3-EXCEPT | |
| parent | 1ef3d38562f686cf06b7a62be13cf9d3a23d0e41 (diff) | |
| parent | c0f586c374d6efbac2b3a25a1cb37924c70286db (diff) | |
| download | qtsvg-e79c376b723f04318c00af6ac09761ab307b1ca4.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Idf7f59a8c4b78438b496f2c16ba9ce48573042e9
Diffstat (limited to 'LICENSE.GPL3-EXCEPT')
0 files changed, 0 insertions, 0 deletions