X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ChangeLog;h=b9a2b11b81fa574517dc60bd5c593aa6d43f2955;hb=e3a4046eff9dc13ba7e092c59de0021dbd72cbf9;hp=1da111720807aad9f2ff6310d8a2cab15d70308d;hpb=d3c7f11b53e25c5eb4bb110b8bb119082e1b99f9;p=lilypond.git

diff --git a/ChangeLog b/ChangeLog
index 1da1117208..b9a2b11b81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2004-05-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/rest-collision.cc (do_shift): also do nothing for the (0,2)
+	case.
+
 2004-05-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/stencil.scm (fontify-text): reinstate function
+
+	* tex/lily-ps-defs.tex: remove lilypondblotdiam def.
+
 	* lily/book-paper-def.cc (Book_paper_def): add copy ctor.
 
 	* lily/parser.yy (book_paper_head): \bookpaper {}