From 9f12922bd88bd7a83247cc7e0646c72773e2a013 Mon Sep 17 00:00:00 2001
From: Michael Zucci <zucchi@src.gnome.org>
Date: Tue, 12 Jul 2005 04:04:14 +0000
Subject: 	Merge back eplugin-import-branch.

svn path=/trunk/; revision=29725
---
 e-util/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'e-util/ChangeLog')

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index bdde3b3347..c80f44b93a 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -11,6 +11,17 @@
 	* e-util/e-account-list.[ch]: Add functions to remove proxy
 	accounts and account's proxies.
 	
+2005-07-06  Not Zed  <NotZed@Ximian.com>
+
+	* e-import.c (e_import_status): added callback for importers to
+	report status.
+	(e_import_cancel): added function for driver to abort an import.
+	(eih_cancel): implemented for hook.
+
+2005-07-05  Not Zed  <NotZed@Ximian.com>
+
+	* e-import.c: cleaned up/finished api.
+
 2005-06-18  Tor Lillqvist  <tml@novell.com>
 
 	* Makefile.am (WIN32_BOOTSTRAP_LIBS): Use bootstrap library for
-- 
cgit v1.2.3