diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-06 10:39:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-06 10:39:51 +0200 |
| commit | 68607aeeeb6ba84b843a0e3d848a5438a36f55a7 (patch) | |
| tree | f7ff7ef369e079599d8be73f909498aeb6e75201 /.qmake.conf | |
| parent | a719e348d22b1ce158a7b2be878965ac3a258914 (diff) | |
| parent | 42f58e557034bb95005db465f078212cfc1b693a (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id27c36e55fcc68cc1140b0d9bec00b8ae6b52ed0
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions