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.cc
+++ b/rtgui/editwindow.cc
@@ -37,7 +37,7 @@ EditWindow* EditWindow::getInstance(RTWindow* p)
    {
        EditWindow editWnd;

-        EditWindowInstance(RTWindow* p) : editWnd(p)
+        explicit EditWindowInstance(RTWindow* p) : editWnd(p)
        {
            // Determine the other display and maximize the window on that
            const Glib::RefPtr< Gdk::Window >& wnd = p->get_window();