diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:32:54 +0100 |
| commit | c49209f274ca5b487eb4f94400cec5d5567dec60 (patch) | |
| tree | 4b9d5b22cf8fe8654b1b707055877478b3e58942 /.qmake.conf | |
| parent | 8f8ec5c0f659eb0cddba7ed94e64af3a04c95d1c (diff) | |
| parent | 92359d2d571f3b553ab915901c62549df5b2512c (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-beta1
Change-Id: I597b48ecb7ad1e9c676aa56a534dafdf3208d173
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions