resolve merge

[lilypond.git] / lily / include / cluster.hh

diff --git a/lily/include/cluster.hh b/lily/include/cluster.hh
index a116bf0a9e3603d375793acd9d3c806997c878d3..2c7bc1dac8264aba92f48693e16d4c413e9fd1ff 100644 (file)
--- a/lily/include/cluster.hh
+++ b/lily/include/cluster.hh
@@ -1,9 +1,20 @@
 /*
-  cluster.hh
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2011 Juergen Reuter <reuter@ipd.uka.de>
 
-  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
+  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 CLUSTER_HH