diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:27:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:27:20 +0100 |
| commit | 21d2f50f6d84be5dc006135ea726e9d34d47b0e4 (patch) | |
| tree | f23739f9cfdcc598511cfff6bad36090620a0664 /.qmake.conf | |
| parent | 4bd5d6ced07d2d0e643a13e7cebb228c521d2046 (diff) | |
| parent | 5f5b5f58a976825c883a772d19beac21aaf4dd1d (diff) | |
| download | qtsvg-21d2f50f6d84be5dc006135ea726e9d34d47b0e4.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I4965154ceaebc75fa968417f3cba47582574a01d
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions