? build-stamp
? mf/feta11.tfm
? mf/feta13.tfm
? mf/feta14.tfm
? mf/feta16.tfm
? mf/feta18.tfm
? mf/feta20.tfm
? mf/feta23.tfm
? mf/feta26.tfm
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.3675
diff -p -u -u -r1.3675 ChangeLog
--- ChangeLog	29 May 2005 10:01:31 -0000	1.3675
+++ ChangeLog	29 May 2005 20:23:16 -0000
@@ -1,3 +1,6 @@
+2005-05-29 Laura Conrad <address@hidden>
+	* abc2ly.py: fix to syntax error in multi-part output.
+	
 2005-05-29  Han-Wen Nienhuys  <address@hidden>
 
 	* lily/bar-line.cc (print): don't round barlines; this produces
Index: debian/changelog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/debian/changelog,v
retrieving revision 1.40
diff -p -u -u -r1.40 changelog
--- debian/changelog	27 Aug 2004 17:33:49 -0000	1.40
+++ debian/changelog	29 May 2005 20:23:16 -0000
@@ -1,3 +1,9 @@
+lilypond (2.5.26.local.1) unstable; urgency=low
+
+  * Local build.
+
+ -- root <address@hidden>  Sat, 28 May 2005 07:03:22 -0400
+
 lilypond (2.2.6-1) unstable; urgency=high
 
   * New upstream stable release.  (Closes: Bug#264263)
Index: scm/lily.scm
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scm/lily.scm,v
retrieving revision 1.348
diff -p -u -u -r1.348 lily.scm
--- scm/lily.scm	28 May 2005 13:43:24 -0000	1.348
+++ scm/lily.scm	29 May 2005 20:23:17 -0000
@@ -256,7 +256,7 @@ The syntax is the same as `define*-publi
 	    
 	    "paper.scm"
 	    "backend-library.scm"
-	    "x11-color.scm"
+;;	    "x11-color.scm"
 
 	    ;; must be after everything has been defined
 	    "safe-lily.scm"))
Index: scripts/abc2ly.py
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scripts/abc2ly.py,v
retrieving revision 1.51
diff -p -u -u -r1.51 abc2ly.py
--- scripts/abc2ly.py	26 Apr 2005 14:04:15 -0000	1.51
+++ scripts/abc2ly.py	29 May 2005 20:23:17 -0000
@@ -286,11 +286,6 @@ def dump_score (outf):
 
 	outf.write ("\n    >>")
 	outf.write ("\n\t\\layout {\n")
-	if part_names:
-		outf.write ("\t    \\translator \n\t    {\n")
-		outf.write ("\t\t\\StaffContext\n")
-#		outf.write ("\t\t\\consists Staff_margin_engraver\n")
-		outf.write ("\t    }\n")
 	outf.write ("\t}\n\t\\midi {%s}\n}\n" % midi_specs)