summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-07-12 10:39:18 +0200
committerEike Ziller <eike.ziller@digia.com>2013-07-12 10:39:18 +0200
commit21f63c24c7d89ec2b7470cf054901a043e884b72 (patch)
tree520fb71c7f7574708a301fdbb67effac45bde06e /src/plugins/git/gitplugin.cpp
parentb99de1de589a7ae0b4280d2cd8daff25d89f3408 (diff)
parenta699dc3c7181c5469b8ee06df5a9a2064a4ccc47 (diff)
downloadqt-creator-21f63c24c7d89ec2b7470cf054901a043e884b72.tar.gz
Merge remote-tracking branch 'origin/2.8'
Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
0 files changed, 0 insertions, 0 deletions