Merging dev into hidpi-icons

2018-11-13 22:37:49 +01:00
parent 785a0e6a46 b0bc0c7add
commit 3d7ef4286e
131 changed files with 6426 additions and 2586 deletions
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -64,7 +64,7 @@ std::vector<Glib::ustring> listSubDirs (const Glib::RefPtr<Gio::File>& dir, bool
            } catch (const Glib::Exception& exception) {

                if (options.rtSettings.verbose) {
-                    std::cerr << exception.what () << std::endl;
+                    std::cerr << exception.what().c_str() << std::endl;
                }

            }