Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -38,7 +38,7 @@

 namespace ProjectExplorer {

-struct BaseProjectWizardDialogPrivate {    
+struct BaseProjectWizardDialogPrivate {
    explicit BaseProjectWizardDialogPrivate(Utils::ProjectIntroPage *page, int id = -1);

    const int introId;