changeset 1543f8fc9950 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1543f8fc9950 description: prepare 0.14.2 release

diffstat:

ChangeLog | 2 +- configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 11dfafb5d6e2 -r 1543f8fc9950 ChangeLog --- a/ChangeLog Thu Oct 28 13:18:37 2010 +0200 +++ b/ChangeLog Tue Jun 07 19:09:00 2011 +0200 @@ -1,4 +1,4 @@ -Gajim 0.14.2 (XX June 2011) +Gajim 0.14.2 (07 June 2011)

* Fix CPU usage when testing file transfer proxies * Fix invalid XML char regex diff -r 11dfafb5d6e2 -r 1543f8fc9950 configure.ac --- a/configure.ac Thu Oct 28 13:18:37 2010 +0200 +++ b/configure.ac Tue Jun 07 19:09:00 2011 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.14.1],[http://trac.gajim.org/%5D,%5Bgajim]) + [0.14.2],[http://trac.gajim.org/%5D,%5Bgajim]) AC_PREREQ([2.59])

AC_CONFIG_HEADER(config.h) diff -r 11dfafb5d6e2 -r 1543f8fc9950 gajim.nsi --- a/gajim.nsi Thu Oct 28 13:18:37 2010 +0200 +++ b/gajim.nsi Tue Jun 07 19:09:00 2011 +0200 @@ -187,7 +187,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.2" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe"

diff -r 11dfafb5d6e2 -r 1543f8fc9950 setup_win32.py --- a/setup_win32.py Thu Oct 28 13:18:37 2010 +0200 +++ b/setup_win32.py Tue Jun 07 19:09:00 2011 +0200 @@ -49,7 +49,7 @@

setup( name='Gajim', - version='0.14.1', + version='0.14.2', description='A full featured Jabber client', author='Gajim Development Team', url='http://www.gajim.org/', diff -r 11dfafb5d6e2 -r 1543f8fc9950 src/common/defs.py --- a/src/common/defs.py Thu Oct 28 13:18:37 2010 +0200 +++ b/src/common/defs.py Tue Jun 07 19:09:00 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po'

-version = '0.14.1' +version = '0.14.2'

import sys, os.path for base in ('.', 'common'):