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/previewhandler.h
+++ b/rtgui/previewhandler.h
@@ -55,7 +55,7 @@ class PreviewHandler : public rtengine::PreviewImageListener {
    public:

        PreviewHandler ();    
-        ~PreviewHandler ();
+        virtual ~PreviewHandler ();

        void addPreviewImageListener (PreviewListener* l) { listeners.push_back (l); }