[springlobby] 02/03: Merge tag 'upstream/0.252+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 88b2625c76b65d5128ca6b167455b407321f1903
Merge: bcd3cfe cf92e7d
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 23 21:42:39 2016 +0200

    Merge tag 'upstream/0.252+dfsg'
    
    Upstream version 0.252+dfsg
    
    # gpg: Signature made Sat 23 Jul 2016 21:42:34 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              |  10 ++++
 VERSION                |   2 +-
 springlobby_config.h   |   2 +-
 src/CMakeLists.txt     |   1 +
 src/chatlog.cpp        |  11 ++---
 src/chatlog.h          |   2 +-
 src/gui/chatpanel.cpp  | 128 ++++++++++++++++++++++++++++---------------------
 src/gui/infodialog.cpp |  68 +-------------------------
 src/springlobbyapp.cpp |   4 +-
 src/sysinfo.cpp        |  86 +++++++++++++++++++++++++++++++++
 src/sysinfo.h          |   4 ++
 src/tests/chatlog.cpp  |   9 ++--
 src/utils/slpaths.cpp  |   5 --
 src/utils/slpaths.h    |   1 -
 14 files changed, 192 insertions(+), 141 deletions(-)

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