From 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 24 Nov 2008 05:14:44 +0000
Subject: Merge revisions 36737:36810 from trunk.

svn path=/branches/kill-bonobo/; revision=36811
---
 e-util/ChangeLog | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'e-util/ChangeLog')

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index f61b43a003..461861d7c3 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,5 +1,16 @@
-<<<<<<< .working
-=======
+2008-11-12  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #559810
+
+	* e-util-labels.c: (e_util_labels_parse):
+	Do not localize empty label names, also localize them only first time.
+
+2008-11-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-non-intrusive-error-dialog.c:
+	* e-non-intrusive-error-dialog.h:
+	Fix compiler warnings.
+
 2008-11-04  Akhil Laddha  <lakhil@novell.com>              
 
 	* e-non-intrusive-error-dialog.c (eni_query_tooltip_cb),
@@ -34,7 +45,6 @@ License Changes
 	* e-plugin-ui.c:
 	* e-plugin-ui.h:
 
->>>>>>> .merge-right.r36736
 2008-10-06  Sankar P  <psankar@novell.com>
 
 	* widgets/table/e-cell-float.c:
-- 
cgit v1.2.3