resolve merge

[lilypond.git] / lily / include / text-interface.hh

diff --git a/lily/include/text-interface.hh b/lily/include/text-interface.hh
index fabcbbc516f4c937726ee66e1338b9b3c54f6721..e01bd4aeab158d02146ddb8c33104c738c921bcc 100644 (file)
--- a/lily/include/text-interface.hh
+++ b/lily/include/text-interface.hh
@@ -1,10 +1,21 @@
 /*
-  text-interface.hh -- declare markup functions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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/>.
 */
 
 #ifndef TEXT_ITEM