From: hanwen <hanwen>
Date: Tue, 6 Jan 2004 17:35:54 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.1.7~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bee3b4678ae49ffcda84e563928f3aef9c609884;p=lilypond.git

release commit
---

diff --git a/ChangeLog b/ChangeLog
index 26a58ff624..37762c395c 100644
--- 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.