merge with dev

2019-11-10 08:56:38 +01:00
parent ba2147033c 5235a82a70
commit e79bb87c91
99 changed files with 482 additions and 199 deletions
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -36,6 +36,7 @@
 #include "renamedlg.h"
 #include "thumbimageupdater.h"
 #include "batchqueue.h"
+#include "batchqueueentry.h"
 #include "placesbrowser.h"
 #include "pathutils.h"
 #include "thumbnail.h"