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-09-17 21:47:10 +0400
committerYann Leboulanger <asterix@lagaule.org>2011-09-17 21:47:10 +0400
commit372d2ed284efe8e5fdc34f9948f12a56d164b577 (patch)
treee42bfdf4e0b44542c24860cbeb80a0176e4a07a8
parent2b859c3a66c1b05db26e4659f5689b091785d1d0 (diff)
prepare 0.15-beta1
-rw-r--r--ChangeLog2
-rwxr-xr-xautogen.sh2
-rw-r--r--src/common/defs.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 657ed6337..fd3d30f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Gajim 0.15 (XX XX 2011)
* IBB
* Nested roster group
* Roster filtrering
+ * UPower support
+ * GPG support for windows
Gajim 0.14.4 (22 July 2011)
diff --git a/autogen.sh b/autogen.sh
index f6c5575d6..a3f7cc0f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15-alpha1"
+ gajimversion="0.15-beta1"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/src/common/defs.py b/src/common/defs.py
index a4728df05..e035610f0 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.15-alpha1'
+version = '0.15-beta1'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,