*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index d919a2cef4b9c472aedca0fafb650fa1b24ac79b..e89d91bdb5ad55d921a8ee648f486e2b928c7850 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-29  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * VERSION (PACKAGE_NAME): release 2.3.13
+
 2004-08-29  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 
        * lily/context-scheme.cc (LY_DEFINE): ly:context-grob-definition
@@ -47,7 +51,6 @@
        * lily/slur-quanting.cc (get_bezier): new functionality, blow up
        slur depending on extents of note heads.
        
->>>>>>> 1.2519
 2004-08-28  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/tutorial.itely: minor editing.