copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge error. Fixes #5154

This commit is contained in:
Yann Leboulanger 2009-07-10 15:48:46 +02:00
parent 278a8bc59e
commit 72ed0a7339
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager], 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_PREREQ([2.59])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)

2
src/common/defs.py
View File

@ -27,7 +27,7 @@ docdir = '../'
datadir = '../' datadir = '../'
localedir = '../po' localedir = '../po'
version = '0.12.1.5-dev' version = '0.12.3.1-dev'
import sys, os.path import sys, os.path
for base in ('.', 'common'): for base in ('.', 'common'):