aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2005-03-18 03:00:00 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2005-03-18 03:00:00 +0800
commit44216ee03c710333c62dcce0d65ff57b2717d888 (patch)
tree1980f2b8bfee4d5a8646d5d51715221a78c0e741
parentbc8b0ad9df8e8cd919b993b38a51fa114497300a (diff)
downloadgsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar.gz
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar.bz2
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar.lz
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar.xz
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.tar.zst
gsoc2013-evolution-44216ee03c710333c62dcce0d65ff57b2717d888.zip
fixed
svn path=/trunk/; revision=29053
-rw-r--r--mail/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index aaee376408..902a16ecf9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -35,7 +35,6 @@
* em-format-hook.c (emfh_format_format): if we are disabled, don't
invoke handler, try to invoke old handler if there was one.
->>>>>>> 1.3608
2005-03-10 Not Zed <NotZed@Ximian.com>
** See bug #73293