resolve merge

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index fa84af9c4bf85563a9048532441d01a00dbf43c8..3fbcdb612b86b8d14f01a90ea9b18507c42d1be0 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,8 +1,21 @@
 /*
-  multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "multi-measure-rest.hh"
@@ -267,7 +280,6 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
                /* read */
                "internalBarNumber "
                "restNumberThreshold "
-               "breakableSeparationItem "
                "currentCommandColumn "
                "measurePosition "
                "measureLength ",