Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Eike Ziller
2013-11-29 11:50:41 +01:00
40 changed files with 1335 additions and 1237 deletions

View File

@@ -374,7 +374,7 @@ private:
const QStringList &arguments,
VcsBase::VcsBaseEditorWidget* editor = 0,
bool useOutputToWindow = false,
bool expectChanges = false,
unsigned additionalFlags = 0,
int editorLineNumber = -1);
// Fully synchronous git execution (QProcess-based).