Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtgui/curveeditorgroup.cc
+++ b/rtgui/curveeditorgroup.cc
@@ -355,7 +355,7 @@ void CurveEditorGroup::setTooltip( Glib::ustring ttip)
 void CurveEditorGroup::setBatchMode (bool batchMode)
 {
    for (std::vector<CurveEditor*>::iterator i = curveEditors.begin(); i != curveEditors.end(); ++i) {
-        (*i)->curveType->addEntry("curveType-unchanged.png", M("GENERAL_UNCHANGED"));
+        (*i)->curveType->addEntry("unchanged-18.png", M("GENERAL_UNCHANGED"));
        (*i)->curveType->show();
    }
 }