aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-01-02 07:24:02 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-01-02 07:24:02 +0800
commit863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07 (patch)
treed9e4a30d411238725bb35d53e59caa928df94258 /mail
parent161d88eee643a9aa9c5d6aa52cce7d4e4d894c72 (diff)
downloadgsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar.gz
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar.bz2
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar.lz
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar.xz
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.tar.zst
gsoc2013-evolution-863c2afc5c3fbaecdc1cdb6e7a70ceccce17ae07.zip
fixed changelog
svn path=/trunk/; revision=7206
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 926733dbf2..073a016148 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -93,7 +93,6 @@
* component-factory.c (factory_destroy): Wait till all views have
gone and then destroy both factories.
->>>>>>> 1.805
2000-12-21 Dan Winship <danw@helixcode.com>
* mail-display.c (pixbuf_for_mime_type): Deal with the possibility