Merge remote branch 'origin/2.1'

This commit is contained in:
Friedemann Kleint
2010-10-27 11:05:31 +02:00
40 changed files with 26000 additions and 7598 deletions

View File

@@ -69,13 +69,6 @@
static const char *const kGitDirectoryC = ".git";
static const char *const kBranchIndicatorC = "# On branch";
static inline QString msgServerFailure()
{
return Git::Internal::GitClient::tr(
"Note that the git plugin for QtCreator is not able to interact with the server "
"so far. Thus, manual ssh-identification etc. will not work.");
}
inline Core::IEditor* locateEditor(const Core::ICore *core, const char *property, const QString &entry)
{
foreach (Core::IEditor *ed, core->editorManager()->openedEditors())