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/curveeditorgroup.h
+++ b/rtgui/curveeditorgroup.h
@@ -98,6 +98,7 @@ class CurveEditorSubGroup {

 private:
 	Glib::ustring& curveDir;
+	Glib::ustring lastFilename;

 protected:
 	int valLinear;