Merge master into gtk3

2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -435,7 +435,7 @@ Gtk::TreePath DirBrowser::expandToDir (const Glib::ustring& absDirPath)
        }

        count++;
-        dir = strtok(NULL, "/\\");
+        dir = strtok(nullptr, "/\\");
    }

    free(dcpy);