diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:48:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:48:09 +0100 |
| commit | 5c419989255be0b1787c6091ca996fb4f346d8f6 (patch) | |
| tree | 448090f1c2dc2b476815820b1e18efe0579b5600 /.qmake.conf | |
| parent | 434c582cf58e43c6ebbca801eddf157710340d7c (diff) | |
| parent | f144f0f71f1b75df9216c36747513444c7941c09 (diff) | |
Merge dev into 5.7
Change-Id: I1fee11c75d15fa3d31832b09f663824e64881382
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions