Merge branch 'master' into jneeman

[lilypond.git] / lily / include / staff-spacing.hh

diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh
index 12472cc065d727ccb3a663981d7d8348ae78bb31..9503c610ec4b59cb90094e6e29355e8d9cda8dc9 100644 (file)
--- a/lily/include/staff-spacing.hh
+++ b/lily/include/staff-spacing.hh
@@ -20,7 +20,7 @@ class Staff_spacing
 
 public:
   DECLARE_GROB_INTERFACE();
-  static Spring get_spacing (Grob *);
+  static Spring get_spacing (Grob *, Grob *right_col);
   static Interval bar_y_positions (Grob *);
 };