[springlobby] 02/07: Merge tag 'upstream/0.256+dfsg'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository springlobby.

commit b2625b3c81b95c2ce2823a2ac77f25c6257252f6
Merge: 3fd0d7f c31d65a
Author: Markus Koschany <apo at debian.org>
Date:   Sat May 6 20:22:30 2017 +0200

    Merge tag 'upstream/0.256+dfsg'
    
    Upstream version 0.256+dfsg
    
    # gpg: Signatur vom Sa 06 Mai 2017 20:22:28 CEST
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 .travis.yml                                        |   1 +
 ChangeLog                                          |   6 +
 VERSION                                            |   2 +-
 springlobby_config.h                               |   2 +-
 src/CMakeLists.txt                                 |   1 +
 src/battle.cpp                                     |  19 +-
 src/downloader/lib/.travis.yml                     |   3 +-
 src/downloader/lib/CMakeLists.txt                  |   2 +-
 src/downloader/lib/src/CMakeLists.txt              |   6 +-
 .../lib/src/Downloader/Http/HttpDownloader.cpp     |   9 +
 .../lib/src/Downloader/Http/HttpDownloader.h       |   2 +-
 src/downloader/lib/src/Downloader/IDownloader.cpp  |  10 +
 src/downloader/lib/src/Downloader/IDownloader.h    |  13 +-
 .../lib/src/Downloader/Rapid/RapidDownloader.cpp   |   3 +-
 .../lib/src/Downloader/Rapid/RapidDownloader.h     |   2 +-
 src/downloader/lib/src/Downloader/Rapid/Repo.cpp   |   2 +-
 src/downloader/lib/src/Downloader/Rapid/Sdp.cpp    | 226 ++++++++++-----------
 src/downloader/lib/src/Downloader/Rapid/Sdp.h      |  22 +-
 src/downloader/lib/src/FileSystem/File.cpp         |   6 +-
 src/downloader/lib/src/FileSystem/FileSystem.cpp   |  95 +++++++--
 src/downloader/lib/src/FileSystem/FileSystem.h     |   9 +-
 src/downloader/lib/src/FileSystem/HashMD5.h        |   2 +-
 src/downloader/lib/src/lib/CMakeLists.txt          |  10 +-
 .../lib/src/lsl/lslunitsync/CMakeLists.txt         |   2 +-
 src/downloader/lib/src/lsl/lslunitsync/c_api.cpp   |   6 +
 src/downloader/lib/src/lsl/lslunitsync/c_api.h     |   1 +
 .../lib/src/lsl/lslunitsync/unitsync.cpp           |  89 ++++----
 src/downloader/lib/src/lsl/lslunitsync/unitsync.h  |   6 +-
 src/downloader/lib/src/main.cpp                    |   6 +
 src/downloader/lib/src/pr-downloader.cpp           |  13 +-
 src/downloader/lib/src/pr-downloader.h             |  12 ++
 src/downloader/lib/test/CMakeLists.txt             |  11 +-
 src/gui/chatpanel.cpp                              |   2 +-
 src/gui/singleplayertab.cpp                        |  14 +-
 src/gui/ui.cpp                                     |  14 --
 src/gui/ui.h                                       |   1 -
 src/ibattle.cpp                                    |  48 +++--
 src/serverevents.cpp                               |   2 +-
 src/socket.cpp                                     |   2 +-
 src/springlobbyapp.cpp                             |   7 +
 src/stacktrace.h                                   |   2 +
 src/sysinfo.cpp                                    |   5 +
 src/tasserver.cpp                                  |  25 ++-
 43 files changed, 451 insertions(+), 270 deletions(-)

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