diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:56 +0100 |
| commit | dd4569940d69248f8bf3fa72dbebb57bb6ddd090 (patch) | |
| tree | 884ba3c26574bd4d6d9ae6fb91be7e779030d729 /.qmake.conf | |
| parent | f0fefa8766cb3cec38f39c31bb01860bea88dcbc (diff) | |
| parent | c826d6ab7f3058857de883eb605abdb399772c01 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4497150a68daf85260a55a6539f5ed178b55a725
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions