# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1204259467 0
# Node ID 2e5ba07ed81a2647a5aeeacaf2fb9bb77bf9db7e
# Parent  c72af988f33a784cde0372bf55c25e7a5376a28b# Parent  50e5ac417035b594908a6353a76108d9a856b5b4
merge of '6694efeab877d30da766aff29ae0e59bad4860fd'
     and 'f16a51f390800324b7ff289f6a61a6e0b629d1c7'

diff -r 50e5ac417035 -r 2e5ba07ed81a ChangeLog
--- a/ChangeLog	Fri Feb 29 04:23:00 2008 +0000
+++ b/ChangeLog	Fri Feb 29 04:31:07 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.4.0 (??/??/2008):
+version 2.4.0 (02/29/2008):
 	libpurple:
 	* Added support for offline messages for AIM accounts (thanks to
 	  Matthew Goldstein)
@@ -62,7 +62,7 @@
 		NOTE: Due to the way this release was made, it is possible that
 		      bugs marked as fixed in 2.3.1 will not be fixed until the
 		      next release.
-	
+
 	* Fixed a number of MSN bugs introduced in 2.3.0, resolving problems
 	  connecting to MSN and random local display name changes
 	* Going idle on MySpaceIM will no longer clear your status and message.
diff -r 50e5ac417035 -r 2e5ba07ed81a ChangeLog.API
--- a/ChangeLog.API	Fri Feb 29 04:23:00 2008 +0000
+++ b/ChangeLog.API	Fri Feb 29 04:31:07 2008 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.4.0 (??/??/????):
+version 2.4.0 (02/29/2008):
 	libpurple:
 		Added:
 		* purple_certificate_add_ca_search_path. (Florian Quèze)
diff -r 50e5ac417035 -r 2e5ba07ed81a ChangeLog.win32
--- a/ChangeLog.win32	Fri Feb 29 04:23:00 2008 +0000
+++ b/ChangeLog.win32	Fri Feb 29 04:31:07 2008 +0000
@@ -1,4 +1,4 @@
-version 2.4.0 (02/28/2008):
+version 2.4.0 (02/29/2008):
 	* Updated GTK+ to 2.12.8
 	* Updated include Meanwhile library to include patches referenced at:
 	  https://sourceforge.net/tracker/?func=detail&atid=656718&aid=1626349&group_id=110565
diff -r 50e5ac417035 -r 2e5ba07ed81a configure.ac
--- a/configure.ac	Fri Feb 29 04:23:00 2008 +0000
+++ b/configure.ac	Fri Feb 29 04:31:07 2008 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [4])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [4])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))