[springlobby] 03/05: Merge tag 'upstream/0.237'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository springlobby.

commit 50906ab4d21b10f2dbe91af9da792f080ee44733
Merge: f67913d 1f92086
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Oct 11 13:34:50 2015 +0200

    Merge tag 'upstream/0.237'
    
    Upstream version 0.237
    
    # gpg: Signature made Sun 11 Oct 2015 13:34:46 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 CMakeLists.txt                                     | 14 ++--
 ChangeLog                                          |  7 +-
 VERSION                                            |  2 +-
 buildbot/buildbot.tac                              |  2 +-
 buildbot/master.cfg                                | 88 +++++++++-------------
 po/ar.po                                           |  6 +-
 po/cs.po                                           |  8 +-
 po/da.po                                           |  6 +-
 po/de.po                                           |  6 +-
 po/el.po                                           |  8 +-
 po/es.po                                           |  6 +-
 po/fi.po                                           |  6 +-
 po/fr.po                                           |  8 +-
 po/it.po                                           |  6 +-
 po/pl.po                                           |  6 +-
 po/pt.po                                           |  6 +-
 po/ro.po                                           |  8 +-
 po/ru.po                                           |  6 +-
 po/springlobby.pot                                 |  6 +-
 po/sv.po                                           |  6 +-
 po/uk.po                                           |  6 +-
 po/zh_CN.po                                        |  8 +-
 springlobby_config.h                               |  2 +-
 src/autohost.cpp                                   |  2 +-
 src/autohost.h                                     |  2 +-
 src/battle.cpp                                     |  4 +-
 src/battlelist.h                                   |  2 +-
 src/channel.h                                      |  2 +-
 src/chatlog.h                                      |  2 +-
 src/crashreport.cpp                                |  3 +-
 src/crashreport.h                                  |  2 +-
 src/downloader/downloadsobserver.h                 |  2 +-
 src/downloader/lib/src/Downloader/Download.cpp     | 35 +++++++--
 src/downloader/lib/src/Downloader/Download.h       |  2 +-
 .../lib/src/Downloader/Http/HttpDownloader.cpp     |  4 +-
 src/downloader/lib/src/Downloader/Rapid/Sdp.cpp    |  4 +-
 src/downloader/lib/src/FileSystem/AtomicFile.h     |  2 +-
 src/downloader/lib/src/FileSystem/File.cpp         |  7 +-
 src/downloader/lib/src/FileSystem/FileSystem.cpp   |  6 +-
 src/downloader/lib/src/FileSystem/IArchive.h       |  2 +-
 .../lib/src/FileSystem/SevenZipArchive.h           |  2 +-
 src/downloader/lib/src/FileSystem/ZipArchive.h     |  2 +-
 src/downloader/prdownloader.cpp                    |  8 +-
 src/downloader/prdownloader.h                      |  1 +
 src/downloadinfo.h                                 |  2 +-
 src/exception.h                                    |  2 +-
 src/gui/basedataviewmodel.h                        |  2 +-
 src/gui/battlelist/battlelisttab.h                 |  2 +-
 src/gui/channel/autojoinchanneldialog.h            |  2 +-
 src/gui/chatpanel.h                                |  2 +-
 src/gui/hosting/battleroommmoptionstab.h           |  2 +-
 src/gui/hosting/hostbattledialog.h                 |  2 +-
 src/gui/mainwindow.h                               |  2 +-
 src/gui/mapselectdialog.h                          |  2 +-
 src/gui/notifications/toasternotification.h        |  2 +-
 src/gui/options/chatoptionstab.cpp                 |  2 +-
 src/gui/ui.cpp                                     |  2 +-
 src/iserver.cpp                                    |  2 +
 src/log.h                                          |  2 +-
 src/lsl/CMakeLists.txt                             |  7 +-
 src/lsl/cmake/sources_list.cmake                   | 25 ------
 src/lsl/src/lslunitsync/c_api.cpp                  | 51 +------------
 src/lsl/src/lslunitsync/c_api.h                    | 17 -----
 src/lsl/src/lslunitsync/loader.cpp                 |  9 ---
 src/lsl/src/lslunitsync/optionswrapper.cpp         |  4 +-
 src/lsl/src/lslunitsync/optionswrapper.h           |  4 +-
 src/singleplayerbattle.h                           |  2 +-
 src/socket.h                                       |  2 +-
 src/sound/alsound.cpp                              |  2 +-
 src/springprocess.h                                |  2 +-
 src/springsettings/tab_simple.cpp                  |  2 +-
 src/tasserver.cpp                                  |  7 +-
 src/user.h                                         |  4 +-
 src/utils/conversion.h                             |  2 +-
 src/utils/curlhelper.cpp                           | 28 +------
 src/utils/curlhelper.h                             | 11 ---
 src/utils/platform.h                               |  2 +-
 src/utils/uievents.h                               |  2 +-
 tools/latest.sh                                    |  4 +
 79 files changed, 218 insertions(+), 322 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git