summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitsubmiteditor.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-07-10 07:44:53 +0200
committerEike Ziller <eike.ziller@qt.io>2018-07-10 07:44:53 +0200
commitd09b71d260c791816c7d6a73d6b7ab801f22865d (patch)
tree673eda244852e3f8d88f1abff5d6955050cad398 /src/plugins/git/gitsubmiteditor.h
parentd20464d56f81d0524cb71b263c76e748832af0f8 (diff)
parent3300182d405bffe062a0f2be900f35822a9e20b0 (diff)
downloadqt-creator-d09b71d260c791816c7d6a73d6b7ab801f22865d.tar.gz
Merge remote-tracking branch 'origin/4.7'
Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/android/androiddebugsupport.cpp Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.h')
0 files changed, 0 insertions, 0 deletions