changeset e159576e9f2e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e159576e9f2e
description: merge
diffstat:
.hgtags | 1 +
ChangeLog | 2 ++
autogen.sh | 2 +-
setup_win32.py | 6 +++---
src/common/defs.py | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diffs (60 lines):
diff -r 0dad513e58f5 -r e159576e9f2e .hgtags
--- a/.hgtags Tue Sep 27 18:16:06 2011 +0300
+++ b/.hgtags Tue Sep 27 18:17:43 2011 +0300
@@ -5,3 +5,4 @@
a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1
91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1
db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1
+50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1
diff -r 0dad513e58f5 -r e159576e9f2e ChangeLog
--- a/ChangeLog Tue Sep 27 18:16:06 2011 +0300
+++ b/ChangeLog Tue Sep 27 18:17:43 2011 +0300
@@ -7,6 +7,8 @@
* IBB
* Nested roster group
* Roster filtrering
+ * UPower support
+ * GPG support for windows
Gajim 0.14.4 (22 July 2011)
diff -r 0dad513e58f5 -r e159576e9f2e autogen.sh
--- a/autogen.sh Tue Sep 27 18:16:06 2011 +0300
+++ b/autogen.sh Tue Sep 27 18:17:43 2011 +0300
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15-alpha1"
+ gajimversion="0.15-beta2"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff -r 0dad513e58f5 -r e159576e9f2e setup_win32.py
--- a/setup_win32.py Tue Sep 27 18:16:06 2011 +0300
+++ b/setup_win32.py Tue Sep 27 18:17:43 2011 +0300
@@ -49,11 +49,11 @@
setup(
name='Gajim',
- version='0.14.1',
+ version='0.15',
description='A full featured Jabber client',
author='Gajim Development Team',
- url='http://www.gajim.org/',
- download_url='http://www.gajim.org/downloads.php',
+ url='http://gajim.org/',
+ download_url='http://gajim.org/downloads.php',
license='GPL',
options=options,
executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),
diff -r 0dad513e58f5 -r e159576e9f2e src/common/defs.py
--- a/src/common/defs.py Tue Sep 27 18:16:06 2011 +0300
+++ b/src/common/defs.py Tue Sep 27 18:17:43 2011 +0300
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.15-alpha1'
+version = '0.15-beta2'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
