Merge remote-tracking branch 'origin/3.4'

2015-03-24 07:40:21 +01:00
parent 674b798350 044eeacde5
commit 9790d8aa00
103 changed files with 1018 additions and 1167 deletions
--- a/src/plugins/git/clonewizardpage.h
+++ b/src/plugins/git/clonewizardpage.h
@@ -41,7 +41,6 @@ namespace Git {

 struct CloneWizardPagePrivate;

-// Used by gitorious as well.
 class CloneWizardPage : public VcsBase::BaseCheckoutWizardPage
 {
    Q_OBJECT
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -61,7 +61,6 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
-#include <coreplugin/coreconstants.h>

 #include <coreplugin/messagebox.h>
 #include <utils/mimetypes/mimedatabase.h>