aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2004-08-31 02:55:34 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-08-31 02:55:34 +0800
commitf7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e (patch)
tree126b03f43c8857a38589b289f5785c44145acffe /mail
parente6c34bb7591be7e13c43724b63fefcc243591866 (diff)
downloadgsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar.gz
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar.bz2
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar.lz
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar.xz
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.tar.zst
gsoc2013-evolution-f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e.zip
fixed merge conflicts
svn path=/trunk/; revision=27088
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog12
1 files changed, 7 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index df67b60003..d73bcf8895 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -40,10 +40,12 @@
2004-08-25 Frederic Crozat <fcrozat@mandrakesoft.com>
- * importers/evolution-mbox-importer.c: (load_file_fn):
- * importers/evolution-outlook-importer.c: (load_file_fn):
- * importers/mail-importer.c: (import_folders_rec):
- Convert filename to UTF-8 from local encoding before displaying it.
+ * importers/evolution-mbox-importer.c (load_file_fn):
+
+ * importers/evolution-outlook-importer.c (load_file_fn):
+
+ * importers/mail-importer.c (import_folders_rec): Convert filename
+ to UTF-8 from local encoding before displaying it.
2004-08-23 Not Zed <NotZed@Ximian.com>
@@ -83,7 +85,7 @@
2004-08-21 Sivaiah Nallagatla <snallagatla@novell.com>
- * mail-erros.xml : changed the groupwise account setup error
+ * mail-erros.xml: changed the groupwise account setup error
message
2004-08-16 Not Zed <NotZed@Ximian.com>