resolve merge

[lilypond.git] / lily / include / scheme-listener.hh

diff --git a/lily/include/scheme-listener.hh b/lily/include/scheme-listener.hh
index d96c7d779a5b0bbcb7e0829bf57365eec41dedc8..e7d89d73bc73edc33b971784b61a5e4a97418053 100644 (file)
--- a/lily/include/scheme-listener.hh
+++ b/lily/include/scheme-listener.hh
@@ -1,9 +1,20 @@
 /*
-  scheme-listener.hh -- Declare Scheme_listener
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2011 Erik Sandberg  <mandolaerik@gmail.com>
 
-  (c) 2006--2009 Erik Sandberg  <mandolaerik@gmail.com>
+  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 SCHEME_LISTENER_HH