diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:48 +0100 |
| commit | dd7c19ea9d6be922faca57013b06b0f2b0787169 (patch) | |
| tree | ca4b5acad83d1dead545087874af89655b9806b4 /.qmake.conf | |
| parent | 3b6de26fe585c586d055ac86c5911cc6df0e3887 (diff) | |
| parent | d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Iafd0dbf7f015e2dc8e5ef987fb247660db41e9fe
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions