diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 09:06:45 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 09:06:50 +0200 |
| commit | 4a9c146e151328165c0266aec432391655f8fc8b (patch) | |
| tree | 6dea2156fcd0ef8533b4e5b884b7cb893944a15c /.qmake.conf | |
| parent | 2cdc2938b44448b8d07cc229282d26d3bca3ee91 (diff) | |
| parent | 7393531856058a8a0fe440d3a64728248958ac81 (diff) | |
Merge remote-tracking branch 'gerrit/5.6.1' into 5.6
Change-Id: I666ffe72bed5b809d4214f0600da65f6bbfc4609
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions