merge with dev

2017-10-14 08:34:38 +02:00
parent b19e12732a dfe40677e2
commit 74cc88ff2f
109 changed files with 3299 additions and 1084 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -203,7 +203,7 @@ public:
    CoarsePanel* coarse;
    Gtk::Notebook* toolPanelNotebook;

-    ToolPanelCoordinator ();
+    ToolPanelCoordinator (bool batch = false);
    virtual ~ToolPanelCoordinator ();

    bool getChangedState                ()