merge with dev

This commit is contained in:
Desmis
2018-12-30 13:57:40 +01:00
11 changed files with 126 additions and 28 deletions

View File

@@ -537,7 +537,7 @@ int main (int argc, char **argv)
bool Console = true;
for (int i = 1; i < argc; i++)
if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R")) {
if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R") || !strcmp (argv[i], "-gimp")) {
Console = false;
break;
}