fix commit conflict
authorPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 09:48:12 +0000 (09:48 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 09:48:12 +0000 (09:48 +0000)
ChangeLog.claws
configure.in

index f87683ec4df47e14ac10f686c99e0914a248dffd..977105db77c8ede83b646abb795314f9ace1a2c0 100644 (file)
@@ -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
index ec8ba8e839b55425d122342fba31614dcb58045b..4833b585e204ff400856424916d6e05b431a21b3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws165
+EXTRA_VERSION=claws166
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target