merge with dev

2018-12-19 15:16:18 +01:00
parent 9f28cdf5ba 39d37a6ded
commit c3bd22f337
122 changed files with 1277 additions and 8235 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -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")) {
+                    if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R")) {
                        Console = false;
                        break;
                    }