aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@src.gnome.org>2002-08-17 02:32:06 +0800
committerChris Toshok <toshok@src.gnome.org>2002-08-17 02:32:06 +0800
commita2b9e3611183d9aa33b15fa53a0901b178d87b65 (patch)
tree1f7d280dedf1a4f53cdfdd4dde3a58378cb0841d
parent366ae7f15a1ab4ba46b3352d36eee4c135f92ff0 (diff)
downloadgsoc2013-evolution-a2b9e3611183d9aa33b15fa53a0901b178d87b65.tar.gz
gsoc2013-evolution-a2b9e3611183d9aa33b15fa53a0901b178d87b65.tar.zst
gsoc2013-evolution-a2b9e3611183d9aa33b15fa53a0901b178d87b65.zip
err, oops.
svn path=/trunk/; revision=17791
-rw-r--r--camel/ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index a15e34d14a..a4ae451a6e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -112,7 +112,6 @@
uids table is not null (if finalised before we ran refresh info).
(id_to_fi): Removed. Use id hash table instead, fixed caller.
->>>>>>> 1.1609
2002-08-05 Jeffrey Stedfast <fejj@ximian.com>
* camel.c (camel_init): Always set a g_atexit handler to
@@ -214,7 +213,6 @@
(email_address_extract): Use is_domain_name_char rather than
is_addr_char for the part after the @.
->>>>>>> 1.1599
2002-07-30 Jeffrey Stedfast <fejj@ximian.com>
* camel-tcp-stream.c (camel_tcp_address_new): Update the comment.