Mercurial > pidgin
diff configure.ac @ 20694:d35d761ded1a
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head e76d28a0d9305478af3a13c36b2feaa466fc27ec)
to branch 'im.pidgin.pidgin' (head fe204b08484653e89ab7ac68a4f50421599e078c)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 20:29:06 +0000 |
| parents | a14208697dcd 9078dd01ea97 |
| children | 58455f507a9b |
line wrap: on
line diff
--- a/configure.ac Fri Sep 28 19:46:09 2007 +0000 +++ b/configure.ac Fri Sep 28 20:29:06 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])