[springlobby] 03/12: Merge tag 'upstream/0.236'
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Oct 1 13:38:56 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 75378f512c2f339823977a17c645858fcff78f63
Merge: 52274fc a65e58c
Author: Markus Koschany <apo at gambaru.de>
Date: Thu Oct 1 11:57:44 2015 +0200
Merge tag 'upstream/0.236'
Upstream version 0.236
# gpg: Signature made Thu 01 Oct 2015 11:57:37 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]
.travis.yml | 3 +-
CMakeLists.txt | 2 +-
ChangeLog | 15 +
VERSION | 2 +-
buildbot/create-build-dirs.sh | 10 +-
buildbot/master.cfg | 143 +-
springlobby_config.h | 2 +-
src/CMakeLists.txt | 28 +-
src/autohost.cpp | 191 +-
src/autohost.h | 3 +-
src/contentmanager.cpp | 2 +
src/downloader/lib/.travis.yml | 12 +
src/downloader/lib/CMakeLists.txt | 29 +-
src/downloader/lib/cmake/FindJsoncpp.cmake | 26 +
src/downloader/lib/src/CMakeLists.txt | 20 +-
src/downloader/lib/src/Downloader/CurlWrapper.cpp | 12 +
src/downloader/lib/src/Downloader/CurlWrapper.h | 3 +
src/downloader/lib/src/Downloader/Download.cpp | 15 +-
src/downloader/lib/src/Downloader/Download.h | 4 +-
.../lib/src/Downloader/Http/HttpDownloader.cpp | 211 +-
.../lib/src/Downloader/Http/HttpDownloader.h | 6 +-
src/downloader/lib/src/Downloader/IDownloader.cpp | 6 +
src/downloader/lib/src/Downloader/IDownloader.h | 4 +
src/downloader/lib/src/Downloader/Mirror.cpp | 10 -
src/downloader/lib/src/Downloader/Mirror.h | 1 -
.../lib/src/Downloader/Rapid/RapidDownloader.cpp | 76 +-
.../lib/src/Downloader/Rapid/RapidDownloader.h | 26 +-
src/downloader/lib/src/Downloader/Rapid/Repo.cpp | 36 +-
src/downloader/lib/src/Downloader/Rapid/Repo.h | 8 +-
src/downloader/lib/src/Downloader/Rapid/Sdp.cpp | 31 +-
src/downloader/lib/src/FileSystem/AtomicFile.h | 6 +-
src/downloader/lib/src/FileSystem/File.cpp | 19 +-
src/downloader/lib/src/FileSystem/File.h | 2 +-
src/downloader/lib/src/FileSystem/FileSystem.cpp | 4 -
src/downloader/lib/src/FileSystem/FileSystem.h | 1 -
src/downloader/lib/src/Util.cpp | 39 +-
src/downloader/lib/src/Util.h | 13 +-
src/downloader/lib/src/lib/CMakeLists.txt | 3 -
src/downloader/lib/src/lib/base64/base64.cpp | 125 +
src/downloader/lib/src/lib/base64/base64.h | 31 +
src/downloader/lib/src/lib/bencode/CMakeLists.txt | 2 +
src/downloader/lib/src/lib/bencode/bencode.cpp | 18 +-
src/downloader/lib/src/lib/jsoncpp/AUTHORS | 1 +
src/downloader/lib/src/lib/jsoncpp/LICENSE | 55 +
src/downloader/lib/src/lib/jsoncpp/README.md | 214 +
.../lib/src/lib/jsoncpp/include/json/assertions.h | 54 +
.../lib/src/lib/jsoncpp/include/json/autolink.h | 25 +
.../lib/src/lib/jsoncpp/include/json/config.h | 109 +
.../lib/src/lib/jsoncpp/include/json/features.h | 57 +
.../lib/src/lib/jsoncpp/include/json/forwards.h | 37 +
.../lib/src/lib/jsoncpp/include/json/json.h | 15 +
.../lib/src/lib/jsoncpp/include/json/reader.h | 404 +
.../lib/src/lib/jsoncpp/include/json/value.h | 841 +
.../lib/src/lib/jsoncpp/include/json/version.h | 13 +
.../lib/src/lib/jsoncpp/include/json/writer.h | 331 +
.../src/lib/jsoncpp/src/lib_json/json_reader.cpp | 2035 +++
.../lib/src/lib/jsoncpp/src/lib_json/json_tool.h | 87 +
.../src/lib/jsoncpp/src/lib_json/json_value.cpp | 1528 ++
.../jsoncpp/src/lib_json/json_valueiterator.inl | 162 +
.../src/lib/jsoncpp/src/lib_json/json_writer.cpp | 1187 ++
src/downloader/lib/src/lib/soap/CMakeLists.txt | 11 -
.../lib/src/lib/soap/ContentService.wsdl | 69 -
.../lib/src/lib/soap/ContentServiceSoap.nsmap | 13 -
src/downloader/lib/src/lib/soap/Makefile.generate | 87 -
src/downloader/lib/src/lib/soap/plasma.h | 415 -
src/downloader/lib/src/lib/soap/soapC.cpp | 2982 ----
.../src/lib/soap/soapContentServiceSoap12Proxy.cpp | 153 -
.../src/lib/soap/soapContentServiceSoap12Proxy.h | 62 -
src/downloader/lib/src/lib/soap/soapH.h | 738 -
src/downloader/lib/src/lib/soap/soapStub.h | 264 -
src/downloader/lib/src/lib/soap/stdsoap2.cpp | 16046 -------------------
src/downloader/lib/src/lib/soap/stdsoap2.h | 2553 ---
src/downloader/lib/src/lib/xmlrpc++/CMakeLists.txt | 6 -
src/downloader/lib/src/lib/xmlrpc++/COPYING | 504 -
src/downloader/lib/src/lib/xmlrpc++/README.html | 109 -
src/downloader/lib/src/lib/xmlrpc++/src/XmlRpc.h | 92 -
.../lib/src/lib/xmlrpc++/src/XmlRpcClient.h | 122 -
.../lib/src/lib/xmlrpc++/src/XmlRpcCurlClient.cpp | 177 -
.../lib/src/lib/xmlrpc++/src/XmlRpcCurlClient.h | 97 -
.../lib/src/lib/xmlrpc++/src/XmlRpcDispatch.h | 89 -
.../lib/src/lib/xmlrpc++/src/XmlRpcException.h | 42 -
.../lib/src/lib/xmlrpc++/src/XmlRpcUtil.cpp | 253 -
.../lib/src/lib/xmlrpc++/src/XmlRpcUtil.h | 61 -
.../lib/src/lib/xmlrpc++/src/XmlRpcValue.cpp | 611 -
.../lib/src/lib/xmlrpc++/src/XmlRpcValue.h | 189 -
src/downloader/lib/src/lib/xmlrpc++/src/base64.h | 381 -
src/downloader/lib/src/main.cpp | 7 +-
src/downloader/lib/src/pr-downloader.cpp | 43 +-
src/downloader/lib/src/pr-downloader.h | 5 +-
src/downloader/prdownloader.cpp | 25 +-
src/gui/basedataviewctrl.h | 142 +-
src/gui/basedataviewmodel.h | 35 +-
src/gui/battlelist/battlelisttab.cpp | 4 +-
src/gui/channel/channelchooser.cpp | 4 +-
src/gui/channel/channelchooser.h | 4 +-
src/gui/channel/channellistctrl.cpp | 186 -
src/gui/channel/channellistctrl.h | 84 -
src/gui/channel/channellistdataviewmodel.cpp | 111 +
src/gui/channel/channellistdataviewmodel.h | 30 +
src/gui/channel/channellistview.cpp | 92 +
src/gui/channel/channellistview.h | 69 +
src/gui/chatpanel.h | 2 +-
src/gui/contentdownloaddialog.cpp | 92 +-
src/gui/contentdownloaddialog.h | 10 +-
src/gui/contentsearchresultdatamodel.cpp | 67 +
src/gui/contentsearchresultdatamodel.h | 30 +
src/gui/contentsearchresultslistctrl.cpp | 127 -
src/gui/contentsearchresultslistctrl.h | 37 -
src/gui/contentsearchresultview.cpp | 30 +
src/gui/contentsearchresultview.h | 34 +
src/gui/customvirtlistctrl.cpp | 679 -
src/gui/customvirtlistctrl.h | 356 -
src/gui/dataviewvtrlheadermenu.h | 5 +-
src/gui/hosting/battleroomtab.cpp | 23 +-
src/gui/hosting/hostbattledialog.cpp | 134 +-
src/gui/hosting/hostbattledialog.h | 9 +-
src/gui/hosting/hostbattledialog_public.h | 13 -
src/gui/hosting/votepanel.cpp | 2 +-
src/gui/iconscollection.h | 7 +-
src/gui/mapgridctrl.cpp | 2 +-
src/gui/nickdataviewctrl.h | 10 +-
src/gui/nickdataviewmodel.h | 14 +-
src/gui/singleplayertab.cpp | 4 +-
src/gui/ui.cpp | 5 -
src/gui/ui.h | 2 -
src/httpfile.cpp | 74 +-
src/ibattle.cpp | 34 +-
src/iserver.h | 9 -
src/json/CMakeLists.txt | 5 -
src/json/jsonreader.cpp | 2075 ---
src/json/jsonval.cpp | 3527 ----
src/json/jsonwriter.cpp | 1257 --
src/json/wx/json_defs.h | 204 -
src/json/wx/jsonreader.h | 148 -
src/json/wx/jsonval.h | 434 -
src/json/wx/jsonwriter.h | 115 -
src/log.h | 1 +
src/lsl/.clang-format | 27 +
src/lsl/.travis.yml | 10 +
src/lsl/CMakeLists.txt | 20 +-
src/lsl/COPYING | 361 +-
src/lsl/cmake/config.h | 2 +-
src/lsl/lib/cimg/CImg.h | 4798 +++---
src/lsl/src/CMakeLists.txt | 3 -
src/lsl/src/lsl/CMakeLists.txt | 1 +
src/lsl/src/lsl/battle/battle.cpp | 1663 +-
src/lsl/src/lsl/battle/battle.h | 196 +-
src/lsl/src/lsl/battle/enum.h | 87 +-
src/lsl/src/lsl/battle/ibattle.cpp | 1139 +-
src/lsl/src/lsl/battle/ibattle.h | 488 +-
src/lsl/src/lsl/battle/offline.cpp | 85 +-
src/lsl/src/lsl/battle/offline.h | 74 +-
src/lsl/src/lsl/battle/signals.h | 46 +-
src/lsl/src/lsl/battle/singleplayer.cpp | 106 +-
src/lsl/src/lsl/battle/singleplayer.h | 81 +-
src/lsl/src/lsl/battle/tdfcontainer.cpp | 639 +-
src/lsl/src/lsl/battle/tdfcontainer.h | 357 +-
src/lsl/src/lsl/channel.cpp | 13 +-
src/lsl/src/lsl/channel.h | 70 +-
src/lsl/src/lsl/container/base.h | 113 +-
src/lsl/src/lsl/container/battlelist.cpp | 18 +-
src/lsl/src/lsl/container/battlelist.h | 39 +-
src/lsl/src/lsl/container/channellist.cpp | 2 +
src/lsl/src/lsl/container/channellist.h | 36 +-
src/lsl/src/lsl/container/userlist.cpp | 47 +-
src/lsl/src/lsl/container/userlist.h | 44 +-
src/lsl/src/lsl/networking/commands.cpp | 170 +-
src/lsl/src/lsl/networking/commands.h | 210 +-
src/lsl/src/lsl/networking/enums.h | 26 +-
src/lsl/src/lsl/networking/function_templates.h | 356 +-
src/lsl/src/lsl/networking/iserver.cpp | 1292 +-
src/lsl/src/lsl/networking/iserver.h | 366 +-
src/lsl/src/lsl/networking/socket.cpp | 275 +-
src/lsl/src/lsl/networking/socket.h | 69 +-
src/lsl/src/lsl/networking/tasserver.cpp | 1351 +-
src/lsl/src/lsl/networking/tasserver.h | 347 +-
.../src/lsl/networking/tasserverdataformats.cpp | 137 +-
src/lsl/src/lsl/networking/tasserverdataformats.h | 121 +-
src/lsl/src/lsl/spring/spring.cpp | 841 +-
src/lsl/src/lsl/spring/spring.h | 67 +-
src/lsl/src/lsl/spring/springprocess.cpp | 24 +-
src/lsl/src/lsl/spring/springprocess.h | 54 +-
src/lsl/src/lsl/user/common.cpp | 63 +-
src/lsl/src/lsl/user/common.h | 168 +-
src/lsl/src/lsl/user/user.cpp | 92 +-
src/lsl/src/lsl/user/user.h | 64 +-
src/lsl/src/lsl/user/userdata.cpp | 42 +-
src/lsl/src/lsl/user/userdata.h | 142 +-
src/lsl/src/lslextract/CMakeLists.txt | 20 +-
src/lsl/src/lslextract/lslextract.cpp | 81 +-
src/lsl/src/lslunitsync/CMakeLists.txt | 10 +-
src/lsl/src/lslunitsync/c_api.cpp | 950 +-
src/lsl/src/lslunitsync/c_api.h | 308 +-
src/lsl/src/lslunitsync/data.h | 96 +-
src/lsl/src/lslunitsync/enum.h | 35 +-
src/lsl/src/lslunitsync/image.cpp | 292 +-
src/lsl/src/lslunitsync/image.h | 95 +-
src/lsl/src/lslunitsync/loader.cpp | 390 +-
src/lsl/src/lslunitsync/loader.h | 44 +-
src/lsl/src/lslunitsync/mmoptionmodel.cpp | 160 +-
src/lsl/src/lslunitsync/mmoptionmodel.h | 69 +-
src/lsl/src/lslunitsync/mru_cache.h | 96 +-
src/lsl/src/lslunitsync/optionswrapper.cpp | 522 +-
src/lsl/src/lslunitsync/optionswrapper.h | 73 +-
src/lsl/src/lslunitsync/sharedlib.cpp | 34 +-
src/lsl/src/lslunitsync/sharedlib.h | 7 +-
src/lsl/src/lslunitsync/signatures.h | 59 +-
src/lsl/src/lslunitsync/springbundle.cpp | 47 +-
src/lsl/src/lslunitsync/springbundle.h | 11 +-
src/lsl/src/lslunitsync/unitsync.cpp | 35 +-
src/lsl/src/lslunitsync/unitsync.h | 62 +-
src/lsl/src/lslutils/CMakeLists.txt | 6 +-
src/lsl/src/lslutils/autopointers.h | 515 +-
src/lsl/src/lslutils/base64.h | 13 +-
src/lsl/src/lslutils/config.cpp | 22 +-
src/lsl/src/lslutils/config.h | 114 +-
src/lsl/src/lslutils/conversion.cpp | 31 +-
src/lsl/src/lslutils/conversion.h | 10 +-
src/lsl/src/lslutils/crc.cpp | 11 +-
src/lsl/src/lslutils/crc.h | 35 +-
src/lsl/src/lslutils/debug.cpp | 1 -
src/lsl/src/lslutils/debug.h | 117 +-
src/lsl/src/lslutils/global_interfaces.h | 16 +-
src/lsl/src/lslutils/globalsmanager.cpp | 60 +-
src/lsl/src/lslutils/globalsmanager.h | 171 +-
src/lsl/src/lslutils/logging.h | 16 +-
src/lsl/src/lslutils/md5.h | 24 +-
src/lsl/src/lslutils/misc.cpp | 244 +-
src/lsl/src/lslutils/misc.h | 259 +-
src/lsl/src/lslutils/mutexwrapper.h | 141 +-
src/lsl/src/lslutils/net.cpp | 14 +-
src/lsl/src/lslutils/net.h | 51 +-
src/lsl/src/lslutils/thread.cpp | 135 +-
src/lsl/src/lslutils/thread.h | 148 +-
src/lsl/src/lslutils/type_forwards.h | 120 +-
src/lsl/test/CMakeLists.txt | 5 +-
src/lsl/test/basic.cpp | 98 +-
src/lsl/test/commands.h | 68 +-
src/lsl/test/common.h | 8 +-
src/lsl/test/swig.cpp | 76 +-
src/lsl/test/usync.cpp | 46 +-
src/lsl/tools/template.cpp | 1 -
src/replaylist.cpp | 39 +-
src/serverevents.cpp | 2 +-
src/sound/CMakeLists.txt | 8 +-
src/sound/alsound.cpp | 4 +-
src/sound/winsound.cpp | 4 +-
src/tasserver.cpp | 42 +-
src/tasserver.h | 2 -
src/tests/CMakeLists.txt | 4 +
src/updater/CMakeLists.txt | 4 +
tools/mxe_compile.sh | 8 +
tools/mxe_create_builddir.sh | 23 +
tools/transform_release_zip.sh | 12 +-
254 files changed, 20818 insertions(+), 47147 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