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/coordinateadjuster.cc
+++ b/rtgui/coordinateadjuster.cc
@@ -123,7 +123,7 @@ void CoordinateAdjuster::createWidgets(const std::vector<Axis> &axis)
    axisAdjusters.resize(axis.size());

    for (unsigned int i = 0; i < count; ++i) {
-        AxisAdjuster *currAdjuster = NULL;
+        AxisAdjuster *currAdjuster = nullptr;
        const Axis *currAxis = &(axis.at(i));
        axisAdjusters.at(i) = new AxisAdjuster(this, currAxis, i);
        currAdjuster = axisAdjusters.at(i);