From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 ui/ChangeLog | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'ui/ChangeLog')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 0e592dd46f..b6402cb979 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,26 @@
+2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #546788
+
+	* evolution-mail-message.xml: Drop unused "ViewNormal" cmd entry.
+
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #517825
+
+	* evolution.xml:
+	Fix duplicate mnemonic.  "_Work Offline" -> "Work _Offline"
+
+2008-07-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #542125
+
+	* evolution-editor.xml:
+	* evolution-event-editor.xml:
+	* evolution-memo-editor.xml:
+	* evolution-task-editor.xml:
+	Remove these files from source control.
+
 2008-06-21  Roshan Kumar Singh  <roshan.singh08@yahoo.com>
 
 	** Fix for bug #395636
-- 
cgit v1.2.3