From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 1 Oct 2008 20:56:04 +0000
Subject: Merge revisions 36016:36533 from trunk.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b6e061892a..1d44cf0449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554458
+
+	* configure.in:
+	Bump glib version to 2.18.0 because of g_content_type_from_mime_type.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Fix 'cs' build break due to my git-merge issues.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Version bump for Evolution 2.25.1
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* COPYING.LGPL2: Add LGPL v2, v3 licensing header.
+	* COPYING.LGPL3:
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS, configure.in: Evolution 2.24.0 release.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Fix for build break. 
+
+2008-09-22  Luca Ferretti  <elle.uca@libero.it>
+
+	* configure.in: 
+	Add mail/default/it/Makefile to AC_OUTPUT.
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* configure.in:
+	Add mail/default/hu/Makefile to AC_OUTPUT.
+
+2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Add mail/default/sr@latin/Makefile to AC_OUTPUT.
+
+2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Add mail/default/sr/Makefile to AC_OUTPUT (bug #552508).
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* iconv-detect.c:
+
 2008-09-10  Michael Meeks  <michael.meeks@novell.com>
 
 	* server.mk: use top_builddir for config.h #551560
-- 
cgit v1.2.3