diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:51 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:51 +0100 |
commit | 855633758577750e44482843b0836cc0437ef1b2 (patch) | |
tree | 097f298789631d5b1b2562af39aab5d280dd4d04 /.qmake.conf | |
parent | 283e95aaf299b6bb320dbacabb099d91f070f116 (diff) | |
parent | 9351df782b513a5e4dbdd2780ef376a0a08e9800 (diff) |
Merge dev into 5.9
Change-Id: I816cc71d81ee6435ff9a58aff2d538698f9f8072
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions