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

merge

Browse source
This commit is contained in:
Denis Fomin 2011-09-27 18:17:43 +03:00
commit 45f2144e3e
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -7,6 +7,8 @@ Gajim 0.15 (XX XX 2011)
* IBB * IBB
* Nested roster group * Nested roster group
* Roster filtrering * Roster filtrering
* UPower support
* GPG support for windows
Gajim 0.14.4 (22 July 2011) Gajim 0.14.4 (22 July 2011)

2
autogen.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
gajimversion="0.15-alpha1" gajimversion="0.15-beta2"
if [ -d ".hg" ]; then if [ -d ".hg" ]; then
node=$(hg tip --template "{node}") node=$(hg tip --template "{node}")
hgversion="-${node:0:12}" hgversion="-${node:0:12}"

6
setup_win32.py
View file

@ -49,11 +49,11 @@ options = {
setup( setup(
name='Gajim', name='Gajim',
version='0.14.1', version='0.15',
description='A full featured Jabber client', description='A full featured Jabber client',
author='Gajim Development Team', author='Gajim Development Team',
url='http://www.gajim.org/', url='http://gajim.org/',
download_url='http://www.gajim.org/downloads.php', download_url='http://gajim.org/downloads.php',
license='GPL', license='GPL',
options=options, options=options,
executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'), executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),

2
src/common/defs.py
View file

@ -27,7 +27,7 @@ docdir = '../'
basedir = '../' basedir = '../'
localedir = '../po' localedir = '../po'
version = '0.15-alpha1' version = '0.15-beta2'
import subprocess import subprocess
try: try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,