resolve merge

[lilypond.git] / lily / break-alignment-interface.cc

diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc
index 437d09e67c63e116b51c1bda5b7a3305b077e18d..18f0ae84047b9af36eb4b2d3f0611dbb18a37f9e 100644 (file)
--- a/lily/break-alignment-interface.cc
+++ b/lily/break-alignment-interface.cc
@@ -1,9 +1,20 @@
 /*
-  break-alignment-interface.cc -- implement Break_alignment_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--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/>.
 */
 
 
@@ -370,6 +381,7 @@ ADD_INTERFACE (Break_alignable_interface,
 
               /* properties */
               "break-align-symbols "
+              "non-break-align-symbols "
               );
 
 ADD_INTERFACE (Break_aligned_interface,