Merge remote branch 'origin/2.0'

Conflicts: src/plugins/cpptools/cppcodecompletion.cpp
2010-05-12 17:25:40 +02:00
parent 64d65fb698 acea722d75
commit 1fd12ab63b
65 changed files with 1014 additions and 512 deletions
--- a/src/plugins/cvs/checkoutwizard.cpp
+++ b/src/plugins/cvs/checkoutwizard.cpp
@@ -53,7 +53,7 @@ QIcon CheckoutWizard::icon() const

 QString CheckoutWizard::description() const
 {
-    return tr("Checks out a project from a CVS repository.");
+    return tr("Checks out a project from a CVS repository and tries to load the contained project.");
 }

 QString CheckoutWizard::displayName() const