resolve merge

[lilypond.git] / lily / break-substitution.cc

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index e4d6a9a853d2a29a67d5d2934bb7a8834c8c3598..2cd29707d611a1d60c704d0c9615eaa7a73af35c 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -1,9 +1,20 @@
 /*
-  break-substitution.cc -- implement grob break substitution.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--2009 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 <cstdio>
@@ -284,8 +295,8 @@ struct Substitution_entry
       }
     else
       {
-       left_ = sr[LEFT];
-       right_ = sr[RIGHT];
+       left_ = (short) sr[LEFT];
+       right_ = (short) sr[RIGHT];
       }
   }
   Substitution_entry ()