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

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index 62862327acfdce663fc323f1c0a8c965d0be94ba..a0e87b58cf57984734386aabc3a6b3dc8ea99b7d 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -10,11 +10,11 @@
 
 
 #ifndef STANDALONE
-String
+string
 Offset::to_string () const
 {
-  String s;
-  s = String (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
     + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }