From c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 12 Jan 2009 04:12:01 +0000
Subject: Merge revisions 36866:37046 from trunk.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 079fd19b1d..29b07c40b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2009-01-08  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #565376
+
+	* configure.in:
+	Bump eds requirement to 2.25.5 because of new functionality.
+
+2009-01-05  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.25.4 release
+
+2009-01-01  Andre Klapper  <a9016009@gmx.de>
+
+	* configure.in:
+	Added Czech translation of quickref.
+
+2008-12-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* shell/main.c:
+	Fix memory leak. (Fixes bug #565628).
+
+2008-12-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Bump eds_minimum_version to 2.25.4 for CAMEL_STORE_IS_MIGRATING.
+
+2008-12-16  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #564248
+
+	* configure.in: Bump libgtkhtml_minimum_version to 3.25.4
+	because of new html editor functions.
+
+2008-12-15  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS: Evolution 2.25.3.1 release
+
+2008-12-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Bump libgtkhtml_minimum_version to 3.25.3 to pick up
+	HTMLTokenizer changes (ABI break, actually).
+
 2008-12-10  Suman Manjunath  <msuman@novell.com>
 
 	* configure.in: Build the weather calendar setup plugin unless 
-- 
cgit v1.2.3