X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=ChangeLog.claws;h=3142ad78eb05f68e70c36ae30b78dae6ca26ba46;hp=58d59d4a9e53149a533b1c44685dfc378a566602;hb=8802f57344b1616230900df4095ea42cb5d0f30a;hpb=1376f2fe3dd47aa10a3e96f8f7c36e099b16a72e

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 58d59d4a9..3142ad78e 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-07 [alfons]	0.6.5claws60
+
+	* src/mbox.c
+		make filtering also work on local spool mbox
+
 2001-12-07 [carsten]	0.6.5claws59
 	* src/addressbook.c
 		addressbook window gets a wmclass distinct from the main
@@ -48,6 +53,7 @@
 		after switching between MVIEW_TEXT and MVIEW_MIME views
 		without deselecting the selection first.
 
+>>>>>>> 1.507
 2001-12-06 [alfons]	0.6.5claws55
 
 	* src/filtering.[ch]