Merge commit 'origin/1.3'

Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h
index 4f934a8939..0d6ad7fbdd 100644
--- a/src/plugins/git/gitplugin.h
+++ b/src/plugins/git/gitplugin.h
@@ -59,6 +59,7 @@ namespace Git {
 namespace Internal {
 
 class GitPlugin;
+class GitVersionControl;
 class GitClient;
 class ChangeSelectionDialog;
 class GitSubmitEditor;
@@ -96,6 +97,7 @@ public:
     void setSettings(const GitSettings &s);
 
     GitClient *gitClient() const;
+    GitVersionControl *versionControl() const;
 
 public slots:
     void updateActions();
@@ -159,6 +161,7 @@ private:
     QAction *m_branchListAction;
 
     GitClient                   *m_gitClient;
+    GitVersionControl           *m_versionControl;
     ChangeSelectionDialog       *m_changeSelectionDialog;
     QString                     m_submitRepository;
     QStringList                 m_submitOrigCommitFiles;