resolve merge

[lilypond.git] / flower / include / interval-set.hh

diff --git a/flower/include/interval-set.hh b/flower/include/interval-set.hh
index eda3a5ef26e885a8673c3ab4afac2467ec12254d..91410142ed76e0fc9baadf6c97ce6f3da9030162 100644 (file)
--- a/flower/include/interval-set.hh
+++ b/flower/include/interval-set.hh
@@ -1,9 +1,20 @@
 /*
-  interval-set.hh -- declare Interval_set
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004 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 INTERVAL_SET_HH