resolve merge

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 13d9738cd03d0da06e30d2671de4b231221d622f..8d4164c4b26c9d822b66ec14aa2f9e773328fe25 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -1,9 +1,20 @@
 /*
-  global-context.cc -- implement Global_context
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--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/>.
 */
 
 #include "global-context.hh"
@@ -189,7 +200,7 @@ Global_context::previous_moment () const
 }
 
 Context *
-Global_context::get_default_interpreter ()
+Global_context::get_default_interpreter (string /* context_id */)
 {
   if (get_score_context ())
     return get_score_context ()->get_default_interpreter ();