diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:59:32 +0100 |
| commit | fc9ee5223e2a533abc9e82dbf19253b788ac457b (patch) | |
| tree | c2d4f5acba2e97189672b2fc6aea6253c678dc7e /.qmake.conf | |
| parent | f787a0353a347aa096d154b7d93c7890f0cd060a (diff) | |
| parent | f56ec245eab24d56800a24f5bc06de1de4f87293 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions