diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 11:59:43 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-23 11:59:43 +0200 |
| commit | bde54c522b76eeb933296aa1a9e159facbf8e529 (patch) | |
| tree | 642588398127104a31d23f3d45c0b31433124a9a /.qmake.conf | |
| parent | 5b548aa2ffe648810c487ecb895631da2be12a33 (diff) | |
| parent | 4a9c146e151328165c0266aec432391655f8fc8b (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: I33cfb293df15c82247561d3540a4513cdf63b910
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions