merged master

This commit is contained in:
John Preston
2015-08-18 19:10:01 +03:00
parent a5c81cfd3b
commit 86f0216447
216 changed files with 52456 additions and 22440 deletions
+3
View File
@@ -232,6 +232,9 @@ void logsInit() {
logsInitDebug();
cSetDebug(true);
}
if (!cDevVersion() && QFile(cWorkingDir() + qsl("tdata/devversion")).exists()) {
cSetDevVersion(true);
}
QDir().setCurrent(cWorkingDir());
}