Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / lily / include / lily-version.hh

diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh
index e0b69bfe9b1a9d970cbce61929c6f2dae38dd2fd..6cacfab231c4b8d6a05b2c1bdc9ed93f867e2fd6 100644 (file)
--- a/lily/include/lily-version.hh
+++ b/lily/include/lily-version.hh
@@ -1,20 +1,30 @@
-/*   
-  lily-version.hh -- declare version strings
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 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 LILY_VERSION_HH
 #define LILY_VERSION_HH
 
-#include "string.hh"
+#include "std-string.hh"
 
-String version_str ();
-String gnu_lilypond_str ();
-String gnu_lilypond_version_str ();
+string version_string ();
+string gnu_lilypond_string ();
+string gnu_lilypond_version_string ();
 
 #endif // LILY_VERSION_HH