release commit

diff --git a/ChangeLog b/ChangeLog
index 26a58ff6247b229bc5d381806be2ba3ace203acb..37762c395c86bab2baafb74d58c6fb1cd4de6ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/regression/collision-merge-dots.ly: new file.
+
        * lily/note-collision.cc (check_meshing_chords): if merging heads,
        then kill the dots too.