update ChangeLog.claws
[claws.git] / ChangeLog.claws
index 2963862dc85c9e7d9ffe904565b3675ec1fdeb14..d16755c90ac2bbfac9c735d5e20d1669e12659a6 100644 (file)
@@ -3,6 +3,8 @@
        * src/compose.c
                fix generating of headers
 
+       (patch by David Relson <relson@osagesoftware.com>)
+
 2003-09-23 [paul]      0.9.5claws27
 
        * po/zh_CN.po
@@ -18,7 +20,6 @@
                sylpheed's xml format
                submitted by Bogdan Sumanariu <bsumanariu@one5.ro>
 
->>>>>>> 1.2533
 2003-09-22 [paul]      0.9.5claws25
 
        * src/plugins/clamav/clamav_plugin.c