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/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -1186,7 +1186,7 @@ void BlackWhite::setBatchMode (bool batchMode)

    removeIfThere (mixerVBox, RGBLabels, false);
    delete RGBLabels;
-    RGBLabels = NULL;
+    RGBLabels = nullptr;

    ToolPanel::setBatchMode (batchMode);
    mixerRed->showEditedCB ();