From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 24 Oct 2008 23:52:05 +0000
Subject: Merge revisions 36534:36684 from trunk.

svn path=/branches/kill-bonobo/; revision=36685
---
 filter/ChangeLog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'filter/ChangeLog')

diff --git a/filter/ChangeLog b/filter/ChangeLog
index 12ee719755..3534320543 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,19 @@
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #503898
+
+	* filter-rule.c: (get_widget): s/criteria/condition/
+
+2008-10-06  Lucian Langa <lucilanga@gnome.org>
+
+	** Fix for bug #554566
+
+	* rule-editor.c: (rule_editor_class_init), (rule_edit),
+	(rule_top), (rule_up), (rule_down), (rule_bottom),
+	(cursor_changed)
+	(update_selected_rule): new function to update
+	current selected rule
+
 2008-10-01  Sankar P  <psankar@novell.com>
 
 License Changes
-- 
cgit v1.2.3