Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/editorpanel.h
+++ b/rtgui/editorpanel.h
@@ -104,8 +104,6 @@ class EditorPanel : public Gtk::VBox,
        virtual ~EditorPanel ();

        void open (Thumbnail* tmb, rtengine::InitialImage* isrc);
-        bool beforeClosing ();
-        void on_realize ();

        void setParent (RTWindow* p) { parent = p; }