resolve merge

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

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 310e5893cdfd9c1e9c7c756b0018f9097da4895f..f16864e3588f54ff1806c63dbf17cfbf6d7bfe24 100644 (file)
--- a/lily/include/freetype.hh
+++ b/lily/include/freetype.hh
@@ -1,9 +1,20 @@
 /*
-  freetype.hh -- declare Freetype global settings.
+  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--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/>.
 */
 
 #ifndef FREETYPE_HH
@@ -17,6 +28,6 @@
 void init_freetype ();
 extern FT_Library freetype2_library;
 
-string freetype_error_string (int code);
+string freetype_error_string (FT_Error code);
 
 #endif /* FREETYPE_HH */