diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:24 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:24 +0100 |
commit | 2e409fef8155c5644693f59f4313c3cd875bf19b (patch) | |
tree | 29152c9cff5468ec3402979afca5a8888c544a77 /.qmake.conf | |
parent | 498b1424ce273beed02c5e1c93ed0ffd610624b8 (diff) | |
parent | 768b2d463663104daae44f564f09c3a10e2e6ad6 (diff) |
Merge remote-tracking branch 'origin/5.7.1' into 5.75.7
Change-Id: I2a96957c3b4ea24a52c5690f3088c6679a7eedce
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions