From: hanwen <hanwen>
Date: Thu, 16 Jun 2005 11:13:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.32~30
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=09f25af1769f67a04328b714b51c528c00ba016d;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index 44af8dd808..5420bd21b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2005-06-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-	* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps): 
+	* make/mutopia-rules.make: -ddelete-intermediate-files
 
 	* ly/engraver-init.ly: make Staff default child of ChoirStaff.
 
@@ -618,7 +618,6 @@
 	* Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Add ly-icon
 	rules.
 
->>>>>>> 1.3718
 2005-05-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/stencil-scheme.cc (LY_DEFINE): ly:stencil-in-color