From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 2 Oct 2006 23:14:44 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: cvs/HEAD~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8f46c7150cf187a8917738284c86ac9d4888a723;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index d9da776d8f..0b61dad2ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* VERSION: release 2.9.20
+
 2006-10-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* scm/define-grob-properties.scm (all-user-grob-properties):
@@ -142,7 +146,6 @@
 	* lily/source-file.cc (get_line): fix off-by-one error
 	and clean up some of the logic
 
->>>>>>> 1.5342
 2006-09-29  Joe Neeman  <joeneeman@gmail.com>
 
 	* lily/page-breaking.cc (make_pages): honour the first-page-number
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 46f7ffe553..dee817c6fe 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -205,6 +205,7 @@ contained staves are not connected vertically."
 
   %% must come before Script_column_engraver.
   \consists "New_fingering_engraver"
+  
   \consists "Chord_tremolo_engraver"
   \consists "Percent_repeat_engraver"
   \consists "Slash_repeat_engraver"