diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:07 +0100 |
commit | c997a1d8eb516d1a344e545c75849ba945136032 (patch) | |
tree | 6044c44c18c3b1695d61adfe65de1f18916ced32 /.qmake.conf | |
parent | 0dfef8643531d7aeb2f5cbadf8d7c9150e6ddc13 (diff) | |
parent | b85631c430446b764d0295d76647aa7a0bb40923 (diff) |
Merge dev into 5.9
Change-Id: I0f85c5de91625d6a04dd7b4f52006aa264b8709a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions