Merged master into gtk3, fixed three conflicts.

2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
--- a/rtgui/myflatcurve.cc
+++ b/rtgui/myflatcurve.cc
@@ -1792,6 +1792,7 @@ 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 ();