resolve merge

[lilypond.git] / lily / include / event-iterator.hh

diff --git a/lily/include/event-iterator.hh b/lily/include/event-iterator.hh
index 9e6570c7be15b6706b48fa92c4919b13120f287e..adabf9d704f03007ba44673ea76bbfc171974721 100644 (file)
--- a/lily/include/event-iterator.hh
+++ b/lily/include/event-iterator.hh
@@ -1,10 +1,21 @@
 /*
-  event-iter.hh -- declare Event_chord_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2006--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
           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 EVENT_ITERATOR_HH