merge with dev

2019-11-28 06:50:05 +01:00
parent f5a5b9a3f5 55709bc449
commit d645dc5951
75 changed files with 181 additions and 213 deletions
--- a/rtgui/cachemanager.cc
+++ b/rtgui/cachemanager.cc
@@ -25,7 +25,7 @@
 #include <glib/gstdio.h>

 #ifdef WIN32
-#include <windows.h>
+#include <fileapi.h>
 #endif

 #include "cachemanager.h"