Merge branch 'master' into 'gtk3'

2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
--- a/rtgui/saveasdlg.h
+++ b/rtgui/saveasdlg.h
@@ -58,7 +58,7 @@ public:
    int             getSaveMethodNum   ();

    void  setInitialFileName (Glib::ustring iname);
-    void  setImagePath (Glib::ustring ipath);
+    void  setImagePath (const Glib::ustring& imagePath);

    void okPressed ();
    void cancelPressed ();