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/profilepanel.h
+++ b/rtgui/profilepanel.h
@@ -87,7 +87,7 @@ public:
    void setInitialFileName (const Glib::ustring& filename);

    // PParamsChangeListener interface
-    void procParamsChanged (rtengine::procparams::ProcParams* params, rtengine::ProcEvent ev, Glib::ustring descr, ParamsEdited* paramsEdited = NULL);
+    void procParamsChanged (rtengine::procparams::ProcParams* params, rtengine::ProcEvent ev, Glib::ustring descr, ParamsEdited* paramsEdited = nullptr);

    // gui callbacks
    void save_clicked (GdkEventButton* event);