Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh
index 345caf46cdf7ac29463e44c2f6b9ff5c5658d7a8..7a97fbba592e0ee75c2e14c2ac9727314fd19678 100644 (file)
--- a/lily/include/lily-version.hh
+++ b/lily/include/lily-version.hh
@@ -3,17 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2007 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