Run grand-replace for 2012

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

diff --git a/lily/include/freetype.hh b/lily/include/freetype.hh
index 2e549e741ee2966386b87e65277b47a3a12c04ef..3ddc07e67fceb620856e6ad085758a148f9761c6 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 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
@@ -12,13 +23,11 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "string.hh"
+#include "std-string.hh"
 
 void init_freetype ();
 extern FT_Library freetype2_library;
 
-
-FT_Face open_ft_face (String str);
+string freetype_error_string (FT_Error code);
 
 #endif /* FREETYPE_HH */
-