summaryrefslogtreecommitdiff
path: root/src/plugins/pythoneditor/pythoneditorplugin.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-05-02 15:22:16 +0200
committerEike Ziller <eike.ziller@qt.io>2018-05-02 15:22:16 +0200
commit4749a919a65fb4588b0b1def352bc80d24704db2 (patch)
tree6e14eaf12e23b151b520bdf235fea62bb2fb3dc9 /src/plugins/pythoneditor/pythoneditorplugin.cpp
parentc46b6dbb5661e9f3d16310da381909376e8e9a6b (diff)
parente8b13fe3c9e0984817d6b7417b43964c0433fcdd (diff)
downloadqt-creator-4749a919a65fb4588b0b1def352bc80d24704db2.tar.gz
Merge remote-tracking branch 'origin/4.6'
Change-Id: I9927fdff4c7e73c703757852a3f3cf79444e3cb6
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
0 files changed, 0 insertions, 0 deletions