Merge with develop

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-11-05 15:31:40 +02:00
commit 940a1e404b

View File

@ -69,7 +69,7 @@ protected:
QString TapePath() const;
QString TranslationsPath() const;
int Run(int exit, const QString &program, const QStringList &arguments, int msecs = 30000);
int Run(int exit, const QString &program, const QStringList &arguments, int msecs = 120000);
bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const;
};