diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:05:28 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:06:10 +0100 |
commit | f4554e29a44af2cdd9e518f5931e28cf349883c6 (patch) | |
tree | b68bfa4d7dde38303a348e00e5c1f3df2ea8a5f6 | |
parent | 1333cc272ff33d864400af970729ffb95cdb8eac (diff) | |
parent | a2156af9ed6bc3e57f715dfe6784a2249ee5fa35 (diff) | |
download | qtsvg-5.11.0-beta1.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: If31f1430d1beb9d99a525bcc8bfa5153e3eea6e2
0 files changed, 0 insertions, 0 deletions