Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh
index 3fdfc26950dc520eeef96757a68958ba916b12be..12c4782205f5d828a58e4522a468cd318418b376 100644 (file)
--- a/lily/include/lilypond-input-version.hh
+++ b/lily/include/lilypond-input-version.hh
@@ -1,28 +1,28 @@
 /*
-  lilypond-version.hh -- declare Lilypond_version
+  lilypond-version.hh -- declare LilyPond_version
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
-
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILYPOND_VERSION_HH
 #define LILYPOND_VERSION_HH
 
-#include "string.hh"
+#include "std-string.hh"
 
-struct Lilypond_version 
+struct Lilypond_version
 {
   Lilypond_version (int major, int minor, int patch);
-  Lilypond_version (String str);
+  Lilypond_version (string str);
 
-  String str () const;
+  string to_string () const;
   operator int () const;
 
-  int major_i_;
-  int minor_i_;
-  int patch_i_;
+  int major_;
+  int minor_;
+  int patch_;
+  string extra_patch_string_;
 };
 
 extern Lilypond_version oldest_version;