changeset b2d16bc55260 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b2d16bc55260 description: fix merge error. Fixes #5154
diffstat: configure.ac | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 1076fc9700f5 -r b2d16bc55260 configure.ac --- a/configure.ac Fri Jul 10 15:05:01 2009 +0200 +++ b/configure.ac Fri Jul 10 15:48:46 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.5-dev],[http://trac.gajim.org/],[gajim]) + [0.12.3.1-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 1076fc9700f5 -r b2d16bc55260 src/common/defs.py --- a/src/common/defs.py Fri Jul 10 15:05:01 2009 +0200 +++ b/src/common/defs.py Fri Jul 10 15:48:46 2009 +0200 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.12.1.5-dev' +version = '0.12.3.1-dev' import sys, os.path for base in ('.', 'common'): _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
