Revert "Merged master into gtk3, fixed three conflicts."

This reverts commit c857bba95e.
2016-06-09 23:24:55 +02:00
parent bd1a7fc4a7
commit 3da7d84ba9
50 changed files with 5937 additions and 6037 deletions
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -1792,7 +1792,6 @@ void MyFlatCurve::setPoints (const std::vector<double>& p)
    stopNumericalAdjustment();
    FlatCurveType t = (FlatCurveType)p[ix++];
    curve.type = t;
-    lit_point = -1;

    if (t == FCT_MinMaxCPoints) {
        curve.x.clear ();