Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2011-06-07 21:09:00 +0400
committerYann Leboulanger <asterix@lagaule.org>2011-06-07 21:09:00 +0400
commit377f06990a9837e2ee96b8e2b7e1afb9d5d14278 (patch)
tree2408006fcc7e2bfabbdb7725444cc08a27ee4e26
parent7ae19c96f44762cdb6538ab6b8d6c21192755e50 (diff)
prepare 0.14.2 releasegajim-0.14.2
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--gajim.nsi2
-rw-r--r--setup_win32.py2
-rw-r--r--src/common/defs.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 42ea3fa6e..082b20408 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/configure.ac b/configure.ac
index e6260fbde..9f0d30110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager],
- [0.14.1],[http://trac.gajim.org/],[gajim])
+ [0.14.2],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h)
diff --git a/gajim.nsi b/gajim.nsi
index 3489072c5..d46f7e8a2 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -187,7 +187,7 @@ Section "Gajim" SecGajim
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 --git a/setup_win32.py b/setup_win32.py
index 7a94bb724..9216ea73c 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -49,7 +49,7 @@ options = {
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 --git a/src/common/defs.py b/src/common/defs.py
index 875da6e47..8620867d4 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.14.1'
+version = '0.14.2'
import sys, os.path
for base in ('.', 'common'):