* Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact

	information.

diff --git a/ChangeLog b/ChangeLog
index 3b72bb36a7466e8488ca03e93292cdc78f31b1a4..c880309ae33507e074245f5b93b731e3fe727703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-09  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
+
+       * Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact
+       information.
+
 2003-04-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/multi-measure-rest-engraver.cc (class
@@ -34,6 +39,7 @@
        * buildscripts/lys-to-tely.py (name2line): add <NAME> tags for
        each file. 
 
+>>>>>>> 1.821
 2003-04-04  Juergen Reuter  <reuter@ipd.uka.de>
 
        * lily/include/custos.hh, make/lilypond.suse.spec.in,