Merge master into gtk3

This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
259 changed files with 5061 additions and 3654 deletions

View File

@@ -79,7 +79,7 @@ ThresholdSelector::ThresholdSelector(double minValue, double maxValue, double de
assert(minValue < maxValue);
#endif
bgCurveProvider = NULL;
bgCurveProvider = nullptr;
separatedSliders = false;
initalEq1 = startAtOne;
minValTop = minValBottom = minValue;
@@ -123,7 +123,7 @@ ThresholdSelector::ThresholdSelector(double minValue, double maxValue, double de
assert(minValue < maxValue);
#endif
bgCurveProvider = NULL;
bgCurveProvider = nullptr;
separatedSliders = false;
initalEq1 = startAtOne;
minValTop = minValBottom = minValue;