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/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -294,12 +294,6 @@ public:
    {
        return toolBar;
    }
-    void removeWbTool()
-    {
-        if (toolBar) {
-            toolBar->removeWbTool();
-        }
-    }
    int  getSpotWBRectSize ();
    CropGUIListener* startCropEditing (Thumbnail* thm = NULL)
    {