merged dev into locallab_dev

2017-05-03 14:15:52 +02:00
parent f2f45458be edfea689b8
commit 2492001c50
33 changed files with 1939 additions and 1700 deletions
--- a/rtgui/cachemanager.h
+++ b/rtgui/cachemanager.h
@@ -62,8 +62,6 @@ public:
    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,
                                       const Glib::ustring& fext,