Mercurial > pidgin.yaz
changeset 21636:b12d8d11d46c
merge of '66d234740bd40b14ef7564f178d84ab82816d6e2'
and '6e23cb6795a35692cf0f84fcea64a7c2748a9bad'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 25 Nov 2007 14:16:54 +0000 |
| parents | c956aff707eb (current diff) 6b10805d29bc (diff) |
| children | 844225b0c905 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Nov 25 02:16:39 2007 +0000 +++ b/configure.ac Sun Nov 25 14:16:54 2007 +0000 @@ -46,8 +46,8 @@ m4_define([purple_lt_current], [3]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [3]) -m4_define([purple_micro_version], [0]) -m4_define([purple_version_suffix], []) +m4_define([purple_micro_version], [1]) +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], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +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]))
--- a/finch/libgnt/configure.ac Sun Nov 25 02:16:39 2007 +0000 +++ b/finch/libgnt/configure.ac Sun Nov 25 14:16:54 2007 +0000 @@ -27,8 +27,8 @@ m4_define([gnt_lt_current], [3]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [0]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [1]) +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]))