merge with dev

2017-07-23 14:19:09 +02:00
parent 432e123733 f24f028fe5
commit a1069920d5
42 changed files with 548 additions and 417 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -372,6 +372,7 @@ extern Glib::ustring argv0;
 extern Glib::ustring argv1;
 extern bool simpleEditor;
 extern bool gimpPlugin;
+extern bool remote;
 extern Glib::ustring versionString;
 extern Glib::ustring paramFileExtension;