[springlobby] 03/05: Merge tag 'upstream/0.247+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 9fe19a34cdedec91e2e030e414ca7d834b98bf82
Merge: 0f49e2d 9d460a8
Author: Markus Koschany <apo at debian.org>
Date:   Sun May 15 00:33:02 2016 +0200

    Merge tag 'upstream/0.247+dfsg'
    
    Upstream version 0.247+dfsg
    
    # gpg: Signature made Sun 15 May 2016 00:32:58 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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 ChangeLog                                          |  8 ++++++++
 VERSION                                            |  2 +-
 springlobby_config.h                               |  2 +-
 .../lib/src/Downloader/Http/HttpDownloader.cpp     | 23 +++++++++++-----------
 .../lib/src/Downloader/Rapid/RapidDownloader.cpp   |  9 ++++++++-
 src/downloader/lib/src/Downloader/Rapid/Sdp.cpp    |  6 ++++++
 src/downloader/lib/src/pr-downloader.cpp           | 17 +++++++++++++---
 src/downloader/prdownloader.cpp                    |  7 +++++++
 src/gui/hosting/addbotdialog.cpp                   |  3 +++
 src/gui/iconscollection.cpp                        | 10 +++++++---
 src/gui/iconscollection.h                          |  2 +-
 11 files changed, 67 insertions(+), 22 deletions(-)

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