Merge from branch 3.0

2011-04-21 23:38:35 +02:00
parent 718c070c4b
commit 628692ed12
10 changed files with 1059 additions and 932 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -166,6 +166,7 @@ class Preferences : public Gtk::Dialog {
    void clearProfilesPressed ();
    void clearThumbImagesPressed ();
    void clearAllPressed ();
+
    void behAddRadioToggled (const Glib::ustring& path);
    void behSetRadioToggled (const Glib::ustring& path);
 //    void selectICCProfileDir ();