aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2004-03-31 07:40:19 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-03-31 07:40:19 +0800
commit342f45f31d84b98cd342742c62f27b8f178d455a (patch)
tree35055c7f1c570b6ac62e90b82ecb3b9ec3f457f1 /camel
parentbcb74f26bfdef06ef9904c797fc5f6e32c1a1e35 (diff)
downloadgsoc2013-evolution-342f45f31d84b98cd342742c62f27b8f178d455a.tar.gz
gsoc2013-evolution-342f45f31d84b98cd342742c62f27b8f178d455a.tar.zst
gsoc2013-evolution-342f45f31d84b98cd342742c62f27b8f178d455a.zip
fixed changelog
svn path=/trunk/; revision=25255
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index ce8cbdbc63..a074fde7a1 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -36,7 +36,6 @@
* camel-debug.c (camel_debug_start, camel_debug_end): some helpers
to wrap debug output for atomicicity.
->>>>>>> 1.2077
2004-03-29 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new):