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
---
 shell/ChangeLog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'shell/ChangeLog')

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4ba417f5d8..307de5bf79 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #557581
+
+	* main.c:
+	Replace DEVELOPMENT with STABLE_VERSION, which actually defines
+	the latest stable version (e.g. 2.24).  STABLE_VERSION is only
+	defined if the current version is _unstable_ (e.g. 2.25).
+
+	* main.c (show_development_warning):
+	Use STABLE_VERSION instead of hard-coding the version number.
+
 2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
 
 	* importer/evolution-importer-client.h:
-- 
cgit v1.2.3