resolve merge

[lilypond.git] / lily / include / simple-music-iterator.hh

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index dc453a7505173ca2d18ec0fb9dfadd7c6a72682f..f046b84689cb2cb438b810e7feb5ee1b152607b5 100644 (file)
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -1,9 +1,20 @@
 /*
-  simple-music-iterator.hh -- declare Simple_music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--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/>.
 */
 
 #ifndef SIMPLE_MUSIC_ITERATOR_HH