Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh
index 8a2670b4ac082d2e7df60b7dc4689df62eed4ce4..c6c93fce8f2d20b066e5d7a025ae5b6ae6e61eca 100644 (file)
--- a/lily/include/lily-version.hh
+++ b/lily/include/lily-version.hh
@@ -1,20 +1,19 @@
-/*   
+/*
   lily-version.hh -- declare version strings
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+
+  (c) 1999--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef LILY_VERSION_HH
 #define LILY_VERSION_HH
 
-#include "string.hh"
+#include "std-string.hh"
 
-String version_string ();
-String gnu_lilypond_string ();
-String gnu_lilypond_version_string ();
+string version_string ();
+string gnu_lilypond_string ();
+string gnu_lilypond_version_string ();
 
 #endif // LILY_VERSION_HH