[springlobby] 02/13: Update upstream source from tag 'upstream/0.260+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 0d840f032cdb834ac1417f325b999d6f4adc0386
Merge: 55766f6 835d111
Author: Markus Koschany <apo at debian.org>
Date:   Wed Nov 1 12:01:06 2017 +0100

    Update upstream source from tag 'upstream/0.260+dfsg'
    
    Update to upstream version '0.260+dfsg'
    with Debian dir d81c3d73a972587d49233243e1998b0630d8a262

 ChangeLog                                          |  6 +++
 VERSION                                            |  2 +-
 springlobby_config.h                               |  2 +-
 src/CMakeLists.txt                                 |  7 +++
 src/battle.cpp                                     | 21 ++++----
 src/channel.cpp                                    |  5 --
 src/channel.h                                      |  1 -
 .../lib/src/lsl/lslunitsync/unitsync.cpp           |  2 +-
 src/gui/chatpanelmenu.cpp                          | 19 -------
 src/gui/chatpanelmenu.h                            |  1 -
 src/gui/hosting/battleroomtab.cpp                  |  8 ++-
 src/iserver.h                                      |  4 --
 src/springlobbyapp.cpp                             |  2 +-
 src/tasserver.cpp                                  | 63 +++++++++++++++-------
 src/tasserver.h                                    |  6 +--
 15 files changed, 81 insertions(+), 68 deletions(-)

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