X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-version.cc;h=1df780b8e1ec05edf7a5a3a951b0d374f397d5e8;hb=6e2bab4168a86c459a5eea83abdda23d9017f27d;hp=5d31b3934271f522bd3da30866b855ee65917b64;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 5d31b39342..1df780b8e1 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,34 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "config.h"
-#include "version.hh"
 #include "lily-version.hh"
 
-String
+#include "config.hh"
+#include "version.hh"
+
+string
 version_string ()
 {
-  String str = MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL;
-  String mpl ("." MY_PATCH_LEVEL);
+  string str = MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL;
+  string mpl ("." MY_PATCH_LEVEL);
   if (mpl != ".")
     str += mpl;
   return str;
 }
 
-String 
+string
 gnu_lilypond_string ()
 {
-  String str = "GNU LilyPond";
+  string str = "GNU LilyPond";
   return str;
 }
 
-String 
+string
 gnu_lilypond_version_string ()
 {
-  String str = gnu_lilypond_string () + " " + version_string ();
+  string str = gnu_lilypond_string () + " " + version_string ();
   return str;
 }