[springlobby] branch master updated (9ae8a7a -> bcd3cfe)

[Markus Koschany]

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

apo pushed a change to branch master
in repository springlobby.

      from  9ae8a7a   Update changelog
       new  41c86a7   Start new changelog entry.
       new  a6e8f5d   Only recommend the spring engine from now on
       new  04fec98   Imported Upstream version 0.249+dfsg
       new  fd1e672   Merge tag 'upstream/0.249+dfsg'
       new  59cad54   debian/watch: Use version=4
       new  bcd3cfe   Update changelog

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                                       |   8 ++
 VERSION                                         |   2 +-
 debian/changelog                                |   9 ++
 debian/control                                  |   3 +-
 debian/watch                                    |   2 +-
 springlobby_config.h                            |   2 +-
 src/gui/basedataviewctrl.h                      |   6 +-
 src/gui/basedataviewmodel.h                     |   4 +-
 src/gui/battlelist/battledataviewcttrl.cpp      |   4 +-
 src/gui/battlelist/battledataviewmodel.cpp      |   4 +-
 src/gui/battlelist/battlelistfilter.cpp         |   2 +-
 src/gui/battlelist/battlelisttab.cpp            |   2 +-
 src/gui/channel/channellistdataviewmodel.cpp    |   2 +-
 src/gui/channel/channellistview.cpp             |   4 +-
 src/gui/chatpanel.cpp                           |   6 +-
 src/gui/contentsearchresultdatamodel.cpp        |   2 +-
 src/gui/customdialogs.cpp                       |   1 +
 src/gui/dataviewctrlheadermenu.cpp              |   2 +-
 src/gui/downloaddataviewmodel.cpp               |   2 +-
 src/gui/hosting/battleroomdataviewctrl.cpp      |  10 +-
 src/gui/hosting/battleroomdataviewmodel.cpp     |  22 ++--
 src/gui/hosting/battleroomtab.cpp               |   4 +-
 src/gui/hosting/votepanel.cpp                   |   4 +-
 src/gui/iconscollection.cpp                     |   6 +-
 src/gui/mainwindow.cpp                          |   9 --
 src/gui/mainwindow.h                            |   1 -
 src/gui/mapgridctrl.cpp                         |   2 +-
 src/gui/nickdataviewctrl.cpp                    |  10 +-
 src/gui/nickdataviewmodel.cpp                   |   6 +-
 src/gui/notifications/toasterbox/ToasterBox.cpp |   2 +-
 src/gui/playback/playbackdatamodel.cpp          |   2 +-
 src/gui/playback/playbackdataview.cpp           |   2 +-
 src/gui/sltipwin.cpp                            |   4 +-
 src/gui/ui.cpp                                  |   4 +-
 src/gui/uiutils.cpp                             |   4 +-
 src/lsl/src/lsl/battle/tdfcontainer.cpp         | 111 ++++++++++++++++++-
 src/lsl/src/lsl/battle/tdfcontainer.h           | 119 --------------------
 src/lsl/src/lslunitsync/c_api.cpp               |   2 +-
 src/lsl/src/lslunitsync/unitsync.cpp            |   4 +
 src/lsl/src/lslutils/type_forwards.h            |   1 -
 src/replaylist.cpp                              | 139 ++++++++++--------------
 src/replaylist.h                                |   1 -
 src/servermanager.cpp                           |   8 +-
 src/springlobbyapp.cpp                          |   6 +-
 src/springlobbyapp.h                            |   1 -
 src/springsettings/settings.rc                  |   2 -
 src/tasserver.cpp                               |  10 +-
 src/tests/config.cpp                            |   6 +-
 src/tests/testingstuff/silent_logger.h          |   2 +-
 src/user.cpp                                    |   2 +-
 src/utils/globalevents.cpp                      |   1 -
 src/utils/globalevents.h                        |   1 -
 src/utils/slpaths.cpp                           |   3 +
 53 files changed, 272 insertions(+), 306 deletions(-)
 delete mode 100644 src/springsettings/settings.rc

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