diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-17 11:44:31 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-17 11:46:07 +0200 |
commit | 7100d186464ce13f1ef923fda118b8ceadb1dcae (patch) | |
tree | 0806433615696a38754178b9f60ccca873667e1b /.qmake.conf | |
parent | 2b5e2bf759946d3c3f3eddafc4092338b05923ae (diff) | |
parent | 6dbe45d39220cdb14164456d49e9537c45e06464 (diff) |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions