changeset 02183268dc3b in /home/hg/repos/gajim

branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=02183268dc3b description: get files from 0.15 branch

diffstat:

ChangeLog | 6 ++++++ autogen.sh | 2 +- gajim.nsi | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 29c6ba3df210 -r 02183268dc3b ChangeLog --- a/ChangeLog Sun May 19 20:40:20 2013 +0400 +++ b/ChangeLog Sat May 25 20:53:36 2013 +0200 @@ -8,6 +8,12 @@ * Support XEP-0224 Attention * 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)

* Better handling of SSL errors diff -r 29c6ba3df210 -r 02183268dc3b autogen.sh --- a/autogen.sh Sun May 19 20:40:20 2013 +0400 +++ b/autogen.sh Sat May 25 20:53:36 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.3" + gajimversion="0.15.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 29c6ba3df210 -r 02183268dc3b gajim.nsi --- a/gajim.nsi Sun May 19 20:40:20 2013 +0400 +++ b/gajim.nsi Sat May 25 20:53:36 2013 +0200 @@ -200,7 +200,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.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/" WriteUninstaller "$INSTDIR\Uninstall.exe"