Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -113,7 +113,10 @@ RTWindow::RTWindow ()
        gtkosx_application_ready (osxApp);
    }
 #endif
-    set_title("RawTherapee "+versionString);
+    Glib::ustring versionStr("RawTherapee "+versionString);
+    if (!versionSuffixString.empty())
+        versionStr += " "+versionSuffixString;
+    set_title(versionStr);
    property_allow_shrink() = true;
    set_default_size(options.windowWidth, options.windowHeight);
    set_modal(false);