Merge with master

[lilypond.git] / lily / include / misc.hh

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index d0bb6f417b3f4dcef37ed47e1c73c87415c7ebc8..fad61b1ad381e33ddbdc3f164f08b0757935d6f6 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -38,7 +38,7 @@ linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 Real directed_round (Real f, Direction d);
 
 Real peak_around (Real epsilon,  Real threshold, Real x);
-Real convex_amplifier (Real standard_x, Real x);
+Real convex_amplifier (Real standard_x, Real increase_factor, Real x);
 string camel_case_to_lisp_identifier (string in);
 
 #endif