merge of '346b13a7c448a4526e5fdbd279df981177d8fc3a' release-2.2.2 v2.2.2

Tue, 23 Oct 2007 19:30:47 +0000

author
Luke Schierer <lschiere@pidgin.im>
date
Tue, 23 Oct 2007 19:30:47 +0000
branch
release-2.2.2
changeset 20272
420a401299c5
parent 20269
346b13a7c448 (current diff)
parent 20271
cee31fa8fd13 (diff)
child 20273
d6246d7a1c59

merge of '346b13a7c448a4526e5fdbd279df981177d8fc3a'
and 'cee31fa8fd13b3f88735053590bbd67f1cbedfd7'

--- a/ChangeLog.win32	Tue Oct 23 17:40:56 2007 +0000
+++ b/ChangeLog.win32	Tue Oct 23 19:30:47 2007 +0000
@@ -126,7 +126,7 @@
 
 version 0.82 (08/26/2004):
 	* Selecting away messages using the system tray icon works
-	  (Thanks Fran?ois Gagn?)
+	  (Thanks François Gagné)
 	* Transparency plugin will save your settings again (Kevin Stange)
 	* Updated gtk-wimp to 0.6.2
 	* Updated libpng to 1.2.6 (major security update)
--- a/configure.ac	Tue Oct 23 17:40:56 2007 +0000
+++ b/configure.ac	Tue Oct 23 19:30:47 2007 +0000
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [2])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [2])
-m4_define([purple_micro_version], [1])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@
 m4_define([gnt_lt_current], [2])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [2])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])

mercurial