diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 23:11:49 +0200 |
| commit | 5b548aa2ffe648810c487ecb895631da2be12a33 (patch) | |
| tree | a7e28e882d7bf2a0148708d845deddbedaf1f1f8 /.qmake.conf | |
| parent | 0690d4801ca5ee92d5e7511d48d95786212d5fb3 (diff) | |
| parent | 2526f2c4f5a22d0d69bf6c96fedfd709e479b246 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions