fix merge error. Fixes #5154
This commit is contained in:
parent
278a8bc59e
commit
72ed0a7339
|
@ -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)
|
||||
|
|
|
@ -27,7 +27,7 @@ docdir = '../'
|
|||
datadir = '../'
|
||||
localedir = '../po'
|
||||
|
||||
version = '0.12.1.5-dev'
|
||||
version = '0.12.3.1-dev'
|
||||
|
||||
import sys, os.path
|
||||
for base in ('.', 'common'):
|
||||
|
|
Loading…
Reference in New Issue