From: Joe Neeman <joeneeman@gmail.com>
Date: Wed, 31 Jan 2007 07:38:46 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.15-1~9^2~3
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=e9a308e9c6002900fc336733950a0175bcbcc333

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

Conflicts:

	lily/text-spanner-engraver.cc
---

e9a308e9c6002900fc336733950a0175bcbcc333
diff --cc lily/text-spanner-engraver.cc
index 0b9f3e4a67,0bdc95efc0..f7b2576d85
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@@ -121,8 -136,15 +121,13 @@@ Text_spanner_engraver::finalize (
      }
  }
  
 -ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 -
  ADD_TRANSLATOR (Text_spanner_engraver,
- 		/* doc */ "Create text spanner from an event.",
- 		/* create */ "TextSpanner",
- 		/* read */ "",
- 		/* write */ "");
+ 		/* doc */
+ 		"Create text spanner from an event.",
+ 		/* create */
+ 		"TextSpanner ",
+ 		/* read */
+ 		"",
+ 		/* write */
+ 		""
+ 		);
diff --cc lily/trill-spanner-engraver.cc
index 8e56784812,0100e66b52..d2ef7e1eb8
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@@ -126,8 -141,10 +126,9 @@@ Trill_spanner_engraver::finalize (
      }
  }
  
 -ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
  ADD_TRANSLATOR (Trill_spanner_engraver,
  		/* doc */ "Create trill spanner from an event.",
- 		/* create */ "TrillSpanner",
+ 		/* create */
+ 		"TrillSpanner ",
  		/* read */ "",
  		/* write */ "");