merge with Dev

2017-07-17 20:37:05 +02:00
parent 3ac25ef503 aab3a60356
commit 3a4c957377
4 changed files with 26 additions and 14 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -138,6 +138,7 @@ public:
    int windowWidth;
    int windowHeight;
    bool windowMaximized;
+    int windowMonitor;
    int meowMonitor;
    bool meowFullScreen;
    bool meowMaximized;