diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 11:10:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 11:10:35 +0200 |
commit | 414562f60b8b8aa7904fbc37475938d696a96829 (patch) | |
tree | 33ca185a025b9a49af1625c0f4e6ae3a6979ccec /.qmake.conf | |
parent | 72df268b0cf6933c6893862fbe2e52f8cf6772db (diff) | |
parent | b231d9f41903f8514a2d91844f4515055307af3a (diff) | |
download | qtsvg-414562f60b8b8aa7904fbc37475938d696a96829.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I02f07888db8531778c1e28aa3da6d2166c7b8c8a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions