Merge branch 'dev' into hidpi-icons

This commit is contained in:
Hombre
2019-01-02 18:06:44 +01:00
14 changed files with 179 additions and 58 deletions

View File

@@ -580,7 +580,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;
}