Merge n.4 from branch3.0

2011-05-15 20:25:33 +02:00
parent 90421820a3
commit af90c97fdc
36 changed files with 1872 additions and 3088 deletions
--- a/rtgui/batchqueue.h
+++ b/rtgui/batchqueue.h
@@ -59,6 +59,7 @@ class BatchQueue  : public ThumbBrowserBase,

  public:
    BatchQueue ();
+    ~BatchQueue ();

    void addEntries (std::vector<BatchQueueEntry*> &entries, bool head=false);
    void cancelItems (std::vector<ThumbBrowserEntryBase*>* items);