Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

Conflicts: src/plugins/coreplugin/outputpane.h
2009-12-14 14:46:43 +01:00
parent 1677ae3787 255e7d1d75
commit 9b93e5e353
40 changed files with 339 additions and 67 deletions
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -269,4 +269,3 @@ QStringList DebuggingHelperLibrary::possibleQMakeCommands()
    return result;
 #endif
 }
-