resolve merge

[lilypond.git] / lily / include / source-file.hh

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 2fd1bfc073b9959cb056cd6af6a6dfe08a31e131..9dedceb48ba17c2310c20a4eea4b8cf8b5e781cc 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -1,9 +1,20 @@
 /*
-  source-file.hh -- declare Source_file
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.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/>.
 */
 
 #ifndef SOURCE_FILE_HH
@@ -53,7 +64,7 @@ public:
 public:
   Slice line_slice (char const *pos_str0) const;
   string line_string (char const *pos_str0) const;
-  void get_counts (char const *pos_str0, int *, int *, int *) const;
+  void get_counts (char const *pos_str0, int *, int *, int *, int *) const;
   
   SCM get_port () const;
   string name_;