From 905bc4ef20410f9649cd13f68a7ec1063e0e8b15 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 28 Sep 2001 00:03:51 +0000
Subject: Always make the Cancel button the last one.

* mail-mt.c (do_user_message): Always make the Cancel button the
last one.

svn path=/trunk/; revision=13207
---
 mail/ChangeLog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mail/ChangeLog')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c4f6f4a882..de3f37837a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-27  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-mt.c (do_user_message): Always make the Cancel button the
+	last one.
+
 2001-09-27    <NotZed@Ximian.com>
 
 	* mail-folder-cache.c (real_note_folder): No such event finalized!
@@ -79,8 +84,6 @@
 	* component-factory.c (component_factory_init): warn and exit if
 	oaf_active_server_register returns OAF_REG_ALREADY_ACTIVE.
 
->>>>>>> 1.1748
->>>>>>> 1.1752
 2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-config.c (config_read): Oops, translate the fake account
-- 
cgit v1.2.3