diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:05:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:05:15 +0100 |
| commit | 4ef60892ce9e8dea75a31b0be7895ebf473346a9 (patch) | |
| tree | 7778fdfb3460d24db63a5f15b28b138507eb1af0 /.qmake.conf | |
| parent | b50d20b7057fcd808525921e56d25f75140c79cd (diff) | |
| parent | a9ac71a443260de66f720f0184646847b03fcb46 (diff) | |
| download | qtsvg-4ef60892ce9e8dea75a31b0be7895ebf473346a9.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ia508d1e3f74dd35ac28b104c0cbdacdb6fe16d6b
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions