Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -58,7 +58,6 @@ FilePanel::FilePanel () : parent(NULL)
    dirpaned->pack1 (*placespaned, false, false);

    tpc = new BatchToolPanelCoordinator (this);
-    tpc->removeWbTool();
    // Location bar
    fileCatalog = Gtk::manage ( new FileCatalog (tpc->coarse, tpc->getToolBar(), this) );
    // Holds the location bar and thumbnails