Mercurial > pidgin
changeset 31201:481da469bd3d
merge of '1ce90eeff222690b47ecfe394e118403b2782a2f'
and '54e7873c4e78229f13e9d60f11a6e65a96bbd9dd'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 12 Feb 2011 16:22:06 +0000 |
| parents | f3baa0787399 (current diff) e3535392b624 (diff) |
| children | 1b1f9d6b25d0 |
| files | |
| diffstat | 4 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 12 16:21:48 2011 +0000 +++ b/ChangeLog Sat Feb 12 16:22:06 2011 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.11 (??/??/????): + version 2.7.10 (02/06/2011): General: * Force video sources to all have the same capabilities. This reduces the
--- a/ChangeLog.API Sat Feb 12 16:21:48 2011 +0000 +++ b/ChangeLog.API Sat Feb 12 16:22:06 2011 +0000 @@ -1,5 +1,7 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.7.11 (??/??/????): + version 2.7.10 (02/06/2011): * No changes
--- a/NEWS Sat Feb 12 16:21:48 2011 +0000 +++ b/NEWS Sat Feb 12 16:22:06 2011 +0000 @@ -2,6 +2,8 @@ Our development blog is available at: http://planet.pidgin.im +2.7.11 (??/??/????): + 2.7.10 (02/06/2011): John: It's release time again. This release contains a bunch of stuff committed from Trac. This is another "thank a patch writer" release.
--- a/configure.ac Sat Feb 12 16:21:48 2011 +0000 +++ b/configure.ac Sat Feb 12 16:22:06 2011 +0000 @@ -46,8 +46,8 @@ m4_define([purple_lt_current], [7]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [7]) -m4_define([purple_micro_version], [10]) -m4_define([purple_version_suffix], []) +m4_define([purple_micro_version], [11]) +m4_define([purple_version_suffix], [devel]) 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])) @@ -55,8 +55,8 @@ m4_define([gnt_lt_current], [8]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [8]) -m4_define([gnt_micro_version], [6]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [7]) +m4_define([gnt_version_suffix], [devel]) 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]))