Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -68,6 +68,7 @@ class ICMPanel : public Gtk::VBox, public AdjusterListener, public FoldableToolP
        ICMPanelListener*  icmplistener;
        
        bool enableLastICCWorkDirChange;
+        Glib::ustring lastRefFilename;

    public:
        ICMPanel ();