diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:16 +0200 |
commit | ded45fc4fe53c443f1be92394fd2c836af4a4930 (patch) | |
tree | ff3ae7d784091b4d5c4ffb5670d8aea2d094416c /.qmake.conf | |
parent | bdaea37070f420bea13a34081e56db1ee792d040 (diff) | |
parent | b052dcaf308d761fa8df39a09f0296b808c928b5 (diff) |
Merge 5.6 into 5.6.1
Change-Id: I96aa7487c341f40c74832f00bc72995d25969329
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions