diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-10 09:54:52 +0200 |
commit | 345ea0307cb34bc7a00acb8881fa53bedb28b0ca (patch) | |
tree | 11b96bf9330e9c7a4b5c1b04b982be2bdd63741b /qtcreatordata.pri | |
parent | 491ab37b1f5499bf53b5c8e41862776ec4d3658c (diff) | |
parent | 4196534759f7f7aa04c8675378cfec57539abc75 (diff) |
Merge remote-tracking branch 'origin/4.3' into 4.4
Conflicts:
qtcreator.qbs
Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
Diffstat (limited to 'qtcreatordata.pri')
0 files changed, 0 insertions, 0 deletions