From f7d31c11f5c3fbd42e0a172e34a1bc8d28e7a44e Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 30 Aug 2004 18:55:34 +0000 Subject: fixed merge conflicts svn path=/trunk/; revision=27088 --- mail/ChangeLog | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'mail') 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 - * 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 @@ -83,7 +85,7 @@ 2004-08-21 Sivaiah Nallagatla - * mail-erros.xml : changed the groupwise account setup error + * mail-erros.xml: changed the groupwise account setup error message 2004-08-16 Not Zed -- cgit v1.2.3