Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Eike Ziller
2013-11-19 07:41:47 +01:00
103 changed files with 1047 additions and 544 deletions

View File

@@ -162,10 +162,7 @@ public:
bool synchronousLog(const QString &workingDirectory,
const QStringList &arguments,
QString *output, QString *errorMessage = 0);
bool synchronousAdd(const QString &workingDirectory,
// Warning: Works only from 1.6.1 onwards
bool intendToAdd,
const QStringList &files);
bool synchronousAdd(const QString &workingDirectory, const QStringList &files);
bool synchronousDelete(const QString &workingDirectory,
bool force,
const QStringList &files);