[springlobby] 04/06: Merge tag 'upstream/0.249+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Mon Jul 11 19:18:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository springlobby.
commit fd1e672c24d0b56ad10435d31280b3e2dc77a51e
Merge: a6e8f5d 04fec98
Author: Markus Koschany <apo at debian.org>
Date: Mon Jul 11 20:52:44 2016 +0200
Merge tag 'upstream/0.249+dfsg'
Upstream version 0.249+dfsg
# gpg: Signature made Mon 11 Jul 2016 20:52:39 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 +-
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 +
50 files changed, 260 insertions(+), 304 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git
More information about the Pkg-games-commits
mailing list