resolve merge

[lilypond.git] / lily / guile-init.cc

diff --git a/lily/guile-init.cc b/lily/guile-init.cc
index 6c2422e76b9cbc7bf61d5ed16d70f95a2eef3cb5..5f1bb6e27fb6487f8e2d71606d4a1561dce9ba41 100644 (file)
--- a/lily/guile-init.cc
+++ b/lily/guile-init.cc
@@ -1,10 +1,21 @@
-/* 
-  guile-init.cc -- implement GUILE init routines.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2006--2009 Han-Wen Nienhuys <hanwen@lilypond.org>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
   
+
+  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/>.
 */
 
 #include  "lily-guile.hh"