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/filepanel.h
+++ b/rtgui/filepanel.h
@@ -29,6 +29,7 @@
 #include "pparamschangelistener.h"
 #include "history.h"
 #include "filterpanel.h"
+#include "exportpanel.h"
 #include "progressconnector.h"

 class RTWindow;
@@ -61,6 +62,7 @@ class FilePanel : public Gtk::HPaned,

        DirBrowser* dirBrowser;
        FilterPanel* filterPanel;
+        ExportPanel* exportPanel;
        FileCatalog* fileCatalog;
        Gtk::Paned *ribbonPane;