Merge remote-tracking branch 'origin/3.2'

Conflicts: src/plugins/git/gerrit/gerritparameters.cpp src/plugins/git/gerrit/gerritplugin.h src/plugins/git/gitclient.cpp Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
2014-07-17 12:42:04 +02:00
parent 98a88b0b84 0c00f44a2d
commit e7ea94b688
143 changed files with 1202 additions and 623 deletions
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -491,7 +491,8 @@ void ProjectWizardPage::slotProjectChanged(int index)
 void ProjectWizardPage::slotManageVcs()
 {
    Core::ICore::showOptionsDialog(VcsBase::Constants::VCS_SETTINGS_CATEGORY,
-                                   VcsBase::Constants::VCS_COMMON_SETTINGS_ID);
+                                   VcsBase::Constants::VCS_COMMON_SETTINGS_ID,
+                                   this);
 }

 } // namespace Internal