Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
This commit is contained in:
con
2010-05-12 17:25:40 +02:00
65 changed files with 1014 additions and 512 deletions

View File

@@ -52,7 +52,7 @@ QIcon CloneWizard::icon() const
QString CloneWizard::description() const
{
return tr("Clones a project from a git repository.");
return tr("Clones a project from a Git repository and tries to load the contained project.");
}
QString CloneWizard::displayName() const

View File

@@ -80,7 +80,7 @@ QIcon GitoriousCloneWizard::icon() const
QString GitoriousCloneWizard::description() const
{
return tr("Clones a project from a Gitorious repository.");
return tr("Clones a project from a Gitorious repository and tries to load the contained project.");
}
QString GitoriousCloneWizard::displayName() const