[springlobby] 02/04: Merge tag 'upstream/0.210'
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Feb 6 21:23:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository springlobby.
commit e432a1d84093896987301ee5e0b0e8a0603b8048
Merge: ed282d3 5ea8262
Author: Markus Koschany <apo at gambaru.de>
Date: Fri Feb 6 21:38:53 2015 +0100
Merge tag 'upstream/0.210'
Upstream version 0.210
# gpg: Signature made Fri 06 Feb 2015 21:38:49 CET 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]
AUTHORS | 24 +-
CMakeLists.txt | 31 +-
ChangeLog | 146 ++-
VERSION | 2 +-
buildbot/create-build-dirs.sh | 3 +-
po/ru.po | 1290 ++++++++++----------
springlobby_config.h | 2 +-
src/CMakeLists.txt | 18 +-
src/autohostmanager.cpp | 105 +-
src/autohostmanager.h | 15 +-
src/battle.cpp | 20 +-
src/battle.h | 2 +-
src/channel.cpp | 2 +-
src/defines.h | 2 +-
src/downloader/lib/.travis.yml | 3 +-
src/downloader/lib/CMakeLists.txt | 2 +
src/downloader/lib/src/Downloader/CurlWrapper.cpp | 2 +-
.../lib/src/Downloader/Http/HttpDownloader.cpp | 27 +
src/downloader/lib/src/Downloader/IDownloader.cpp | 3 +
.../lib/src/lib/xmlrpc++/src/XmlRpcCurlClient.cpp | 25 +-
src/gui/aboutbox.cpp | 2 +-
src/gui/battlelist/battlelistctrl.cpp | 30 +-
src/gui/battlelist/battlelistctrl.h | 9 +-
src/gui/battlelist/battlelistfilter.cpp | 78 +-
src/gui/battlelist/battlelisttab.cpp | 20 +-
src/gui/chatpanel.cpp | 10 +-
src/gui/chatpanel.h | 7 +-
src/gui/customlistctrl.cpp | 14 +-
src/gui/customlistctrl.h | 15 +-
src/gui/customvirtlistctrl.cpp | 21 +-
src/gui/customvirtlistctrl.h | 7 +-
src/gui/hosting/battlemaptab.cpp | 5 +-
src/gui/hosting/battleroomlistctrl.cpp | 23 +-
src/gui/hosting/battleroommmoptionstab.cpp | 9 +-
src/gui/hosting/battleroomtab.cpp | 15 +-
src/gui/hosting/battleroomtab.h | 3 -
src/gui/mainwindow.cpp | 13 +-
src/gui/mainwindow.h | 19 +-
src/gui/mapgridctrl.cpp | 11 +-
src/gui/mapgridctrl.h | 2 +-
src/gui/nicklistctrl.cpp | 63 +-
src/gui/nicklistctrl.h | 8 +-
src/gui/options/lobbyoptionstab.cpp | 2 +-
src/gui/options/springoptionstab.cpp | 19 +
src/gui/playback/playbackfilter.cpp | 2 +
src/gui/playback/playbacklistctrl.cpp | 26 +-
src/gui/playback/playbacklistctrl.h | 1 +
src/gui/playback/playbacktab.cpp | 19 +-
src/gui/playback/playbacktab.h | 3 +-
src/gui/slbook.cpp | 6 +-
src/gui/slbook.h | 3 -
src/gui/ui.cpp | 23 +-
src/gui/ui.h | 2 -
src/ibattle.cpp | 5 +-
src/ibattle.h | 7 +-
src/iserver.h | 2 +-
src/iserverevents.h | 102 +-
src/log.cpp | 7 +-
src/lsl/CMakeLists.txt | 20 +-
src/lsl/doc/CMakeLists.txt | 9 -
src/lsl/src/lsl/CMakeLists.txt | 18 +-
src/lsl/src/lsl/spring/spring.cpp | 7 +-
src/lsl/src/lslunitsync/optionswrapper.h | 2 +-
src/lsl/src/lslunitsync/springbundle.cpp | 6 +-
src/offlinebattle.cpp | 4 +-
src/replaylist.cpp | 2 +-
src/serverevents.cpp | 304 ++---
src/serverevents.h | 104 +-
src/settings.cpp | 25 +-
src/settings.h | 2 +-
src/socket.cpp | 11 +-
src/spring.cpp | 7 +-
src/spring.h | 4 +-
src/springlobbyapp.cpp | 6 +
src/springsettings/CMakeLists.txt | 5 +
src/springsettings/tab_abstract.cpp | 4 +-
src/tasserver.cpp | 361 +++---
src/tasserver.h | 14 +-
src/user.cpp | 5 +-
src/user.h | 6 +-
src/utils/conversion.h | 10 -
src/utils/tasutil.cpp | 8 +-
src/utils/tasutil.h | 4 +-
83 files changed, 1766 insertions(+), 1519 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