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

get files from 0.15 branch

This commit is contained in:
Yann Leboulanger 2013-05-25 20:53:36 +02:00
parent ea1d192153
commit 96c48693c0
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -8,6 +8,12 @@ Gajim 0.16 ()
* Support XEP-0224 Attention * Support XEP-0224 Attention
* Support XEP-0191 Blocking command * Support XEP-0191 Blocking command
Gajim 0.15.4 (25 May 2013)
* Fix usage of OTR plugin
* Fix connection to non-SSL server
* Fix receiving GPG-encrypted messages while offline.
Gajim 0.15.3 (17 March 2013) Gajim 0.15.3 (17 March 2013)
* Better handling of SSL errors * Better handling of SSL errors

2
autogen.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
gajimversion="0.15.3" gajimversion="0.15.4"
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}"

2
gajim.nsi
View File

@ -200,7 +200,7 @@ Section "Gajim" SecGajim
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" 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" "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" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe" WriteUninstaller "$INSTDIR\Uninstall.exe"

2
src/common/defs.py
View File

@ -27,7 +27,7 @@ docdir = '../'
basedir = '../' basedir = '../'
localedir = '../po' localedir = '../po'
version = '0.15.3.0' version = '0.15.4.0'
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,