From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 29 Aug 2004 15:22:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.3.14~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9362af693c2e902d788067f9aff3654ad45d04ff;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index d919a2cef4..e89d91bdb5 100644
--- 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.