Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/editwindow.h
+++ b/rtgui/editwindow.h
@@ -42,7 +42,7 @@ public:
    // Should only be created once, auto-creates window on correct display
    static EditWindow* getInstance(RTWindow* p);

-    EditWindow (RTWindow* p);
+    explicit EditWindow (RTWindow* p);

    void addEditorPanel (EditorPanel* ep, const std::string &name);
    void remEditorPanel (EditorPanel* ep);