diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 12:22:48 +0200 |
commit | b5e75222373db078591f1e55642a771139fb4e4f (patch) | |
tree | 077fdd13d6dcd57dd2cbe05c318b7bbb9f0a7b69 /qtcreatordata.pri | |
parent | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (diff) | |
parent | 3726218b5e1311f67f41e56d1355bd35b86d9676 (diff) |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/pythoneditor/pythoneditorplugin.cpp
Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
Diffstat (limited to 'qtcreatordata.pri')
0 files changed, 0 insertions, 0 deletions