diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-13 10:52:32 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-13 10:52:32 +0200 |
| commit | 97e6be5d5b218f537cf82f4ddf92007843001124 (patch) | |
| tree | 719761136dc6448da0ad999dbe073bebe69feb39 /.qmake.conf | |
| parent | cae291161f323df54aabf5333f485352a8d84e6e (diff) | |
| parent | 4bce183390c6a4633dd46d0b0cd4c1c24877fe87 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Iba0e12721ec9ab0fc70b078f73dc4ec89df05aa3
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions