merge with dev

2017-07-06 18:10:25 +02:00
parent dfffa2e8aa b1dd97dac5
commit d204369f83
21 changed files with 366 additions and 317 deletions
--- a/rtgui/cachemanager.h
+++ b/rtgui/cachemanager.h
@@ -61,6 +61,7 @@ public:
    void clearProfiles () const;
    void clearmip () const;
    void clearFromCache (const Glib::ustring& fname, bool purge) const;
+    static std::string getMD5 (const Glib::ustring& fname);

    Glib::ustring    getCacheFileName (const Glib::ustring& subDir,
                                       const Glib::ustring& fname,