fix commit conflict

[claws.git] / ChangeLog.claws

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f87683ec4df47e14ac10f686c99e0914a248dffd..977105db77c8ede83b646abb795314f9ace1a2c0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,8 +1,15 @@
-2002-11-18 [paul]      0.8.5claws165
+2002-11-18 [paul]      0.8.5claws166
 
        * po/ru.po
                updated by Ruslan N. Balkin <baron@dartel.ru>
 
+2002-11-18 [colin]     0.8.5claws165
+
+       * src/main.c
+         src/defs.h
+               Remove old filtering stuff
+
+
 2002-11-17 [oliver]    0.8.5claws164
 
        * src/toolbar.h