diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-11 11:38:03 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-11 11:38:03 +0100 |
| commit | ce888b45efb04ad4fddc873d3be3241150ae6810 (patch) | |
| tree | 8c57241bf862e4cf0c18090b6634eea848ee7017 /src/plugins/pythoneditor/pythoneditorplugin.cpp | |
| parent | 5006bfb1572c64da2ac3d5104074c50cbdfa785a (diff) | |
| parent | 37eb282313783e2b9834fedf12ad14d23581b067 (diff) | |
| download | qt-creator-ce888b45efb04ad4fddc873d3be3241150ae6810.tar.gz | |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
src/libs/qmljs/qmljscheck.cpp
Change-Id: Ib3d97e8e59463185e2fa4663ae594c1e29b4b337
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
0 files changed, 0 insertions, 0 deletions