changeset 16891:d8e16018a9be

merge of '23377eb2770b8f45c3d732466c4fae99a90220f1' and '8f99a08aaf41285d540017a3eeff5cc816c85403'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 04 May 2007 05:28:46 +0000
parents 228fc699dadb (diff) e7f75084d059 (current diff)
children a7052595b95a
files NEWS
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri May 04 05:29:09 2007 +0000
+++ b/NEWS	Fri May 04 05:28:46 2007 +0000
@@ -44,15 +44,15 @@
 	in the world - those who like our new names and those who do not.
 	Enjoy!
 
+	Sadrul: My first NEWS, and on what an occasion! Pidgin 2.0.0 is finally
+	released!! And it's *really* very good!!! Give your soul a break ...
+	Use Pidgin!
+
 	Richard: I'm very glad that we've finally gotten 2.0.0 released and
 	I look forward to returning to a more normal development schedule.
 	Again, a big thanks to everyone who helped in any way to get things
 	where they are today.  Congratulations everyone!
 
-	Sadrul: My first NEWS, and on what an occasion! Pidgin 2.0.0 is finally
-	released!! And it's *really* very good!!! Give your soul a break ...
-	Use Pidgin!
-
 2.0.0beta7 (4/29/2007):
 	Sean: Beta 7. The final beta. A few major changes from beta6. For
 	starters, we have some new names. That's pretty cool. We have a new
--- a/configure.ac	Fri May 04 05:29:09 2007 +0000
+++ b/configure.ac	Fri May 04 05:28:46 2007 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [0])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [beta7])
+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], [1])
 m4_define([gnt_minor_version], [0])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [beta7])
+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]))