merge with dev - I hope no error

2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -108,8 +108,8 @@ public:
    class Error: public std::exception
    {
    public:
-        Error (const Glib::ustring &msg): msg_ (msg) {}
-        const char *what() const throw()
+        explicit Error (const Glib::ustring &msg): msg_ (msg) {}
+        const char *what() const throw() override
        {
            return msg_.c_str();
        }