Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -78,7 +78,7 @@ class EditorPanel : public Gtk::VBox,
        Gtk::Button* saveimgas;
        Gtk::Button* sendtogimp;

-        ImageAreaPanel* iarea;
+        ImageAreaPanel* iareapanel;
        PreviewHandler* previewHandler;
        PreviewHandler* beforePreviewHandler;   // for the before-after view
        Navigator* navigator;