[springlobby] 05/28: Merge tag 'upstream/0.244+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Mon Apr 11 04:58:39 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 81b127552b04d7c97038e4b9390c5b30267042cf
Merge: 61f2f23 30516c4
Author: Markus Koschany <apo at debian.org>
Date: Sun Apr 10 22:33:57 2016 +0200
Merge tag 'upstream/0.244+dfsg'
Upstream version 0.244+dfsg
# gpg: Signature made Sun 10 Apr 2016 22:33:53 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]
.travis.yml | 15 +-
CMakeLists.txt | 10 +-
ChangeLog | 28 +
VERSION | 2 +-
buildbot/master.cfg | 131 +-
cmake/package_config.cmake | 1 +
images/exported/ingame_pw.png | Bin 0 -> 897 bytes
po/ru.po | 9 +
share/freedesktop.org/springlobby.appdata.xml | 28 +-
springlobby_config.h | 2 +-
src/CMakeLists.txt | 25 +-
src/autohost.cpp | 52 +-
src/battle.cpp | 43 +-
src/battle.h | 98 +-
src/channel.cpp | 31 +-
src/contentdownloadrequest.cpp | 113 --
src/contentdownloadrequest.h | 40 -
src/contentmanager.cpp | 233 ---
src/contentmanager.h | 48 -
src/contentsearchresult.h | 2 +
src/crashreport.cpp | 195 --
src/crashreport.h | 57 -
src/downloader/downloaddataviewctrl.cpp | 60 -
src/downloader/downloaddataviewmodel.cpp | 86 -
src/downloader/downloaddataviewmodel.h | 32 -
src/downloader/downloadsobserver.cpp | 110 --
src/downloader/downloadsobserver.h | 89 -
src/downloader/lib/README.md | 23 +-
src/downloader/lib/src/CMakeLists.txt | 5 +-
src/downloader/lib/src/Downloader/Download.cpp | 69 +-
src/downloader/lib/src/Downloader/Download.h | 31 +-
src/downloader/lib/src/Downloader/DownloadEnum.cpp | 45 +
src/downloader/lib/src/Downloader/DownloadEnum.h | 32 +
.../lib/src/Downloader/Http/HttpDownloader.cpp | 209 +-
.../lib/src/Downloader/Http/HttpDownloader.h | 5 +-
src/downloader/lib/src/Downloader/IDownloader.cpp | 28 +-
src/downloader/lib/src/Downloader/IDownloader.h | 9 +-
.../lib/src/Downloader/IDownloadsObserver.cpp | 14 -
.../lib/src/Downloader/IDownloadsObserver.h | 16 -
.../lib/src/Downloader/Plasma/PlasmaDownloader.cpp | 90 -
.../lib/src/Downloader/Plasma/PlasmaDownloader.h | 19 -
.../lib/src/Downloader/Rapid/RapidDownloader.cpp | 49 +-
.../lib/src/Downloader/Rapid/RapidDownloader.h | 8 +-
src/downloader/lib/src/Downloader/Rapid/Repo.cpp | 2 +
src/downloader/lib/src/Downloader/Rapid/Sdp.cpp | 30 +-
src/downloader/lib/src/Downloader/Rapid/Sdp.h | 10 +-
src/downloader/lib/src/FileSystem/AtomicFile.cpp | 62 -
src/downloader/lib/src/FileSystem/AtomicFile.h | 19 -
src/downloader/lib/src/FileSystem/File.cpp | 49 +-
src/downloader/lib/src/FileSystem/File.h | 15 +-
src/downloader/lib/src/FileSystem/FileData.cpp | 1 -
src/downloader/lib/src/FileSystem/FileSystem.cpp | 8 +-
src/downloader/lib/src/FileSystem/HashCRC32.cpp | 47 -
src/downloader/lib/src/FileSystem/HashCRC32.h | 23 -
src/downloader/lib/src/FileSystem/HashMD5.cpp | 2 +-
src/downloader/lib/src/FileSystem/HashMD5.h | 1 +
src/downloader/lib/src/FileSystem/IFile.h | 42 -
.../lib/src/FileSystem/SevenZipArchive.cpp | 4 +-
src/downloader/lib/src/Util.cpp | 9 -
src/downloader/lib/src/Util.h | 6 -
src/downloader/lib/src/lib/bencode/bencode.cpp | 54 -
src/downloader/lib/src/lib/bencode/bencode.h | 4 -
src/downloader/lib/src/main.cpp | 36 +-
src/downloader/lib/src/pr-downloader.cpp | 174 +-
src/downloader/lib/src/pr-downloader.h | 39 +-
src/downloader/prdownloader.cpp | 393 ++--
src/downloader/prdownloader.h | 78 +-
src/downloadinfo.cpp | 71 -
src/downloadinfo.h | 39 -
src/exception.cpp | 13 +-
src/exception.h | 3 +-
src/gui/activitynotice.h | 2 +-
src/gui/agreementdialog.cpp | 4 +-
src/gui/basedataviewctrl.h | 64 +-
src/gui/basedataviewmodel.h | 19 +-
src/gui/battlelist/battledataviewcttrl.cpp | 107 +-
src/gui/battlelist/battledataviewcttrl.h | 7 +-
src/gui/battlelist/battledataviewmodel.cpp | 425 ++--
src/gui/battlelist/battledataviewmodel.h | 11 +-
src/gui/battlelist/battlelistfilter.cpp | 28 +-
src/gui/battlelist/battlelistfilter.h | 12 +-
src/gui/battlelist/battlelisttab.cpp | 45 +-
src/gui/channel/channelchooser.cpp | 1 +
src/gui/channel/channellistdataviewmodel.cpp | 138 +-
src/gui/channel/channellistdataviewmodel.h | 12 +-
src/gui/channel/channellistview.cpp | 51 +-
src/gui/channel/channellistview.h | 6 +-
src/gui/chatpanel.cpp | 59 +-
src/gui/chatpanel.h | 1 +
src/gui/chatpanelmenu.cpp | 2 +-
src/gui/connectwindow.cpp | 28 +-
src/gui/contentdownloaddialog.cpp | 46 +-
src/gui/contentsearchresultdatamodel.cpp | 77 +-
src/gui/contentsearchresultview.cpp | 23 +-
src/gui/controls/bitmapcombobox.cpp | 152 ++
src/gui/controls/bitmapcombobox.h | 68 +
src/gui/customdialogs.cpp | 52 +-
src/gui/customdialogs.h | 9 +-
src/gui/dataviewctrlheadermenu.cpp | 28 +-
src/gui/downloaddataviewctrl.cpp | 151 ++
src/{downloader => gui}/downloaddataviewctrl.h | 22 +-
src/gui/downloaddataviewmodel.cpp | 85 +
src/gui/downloaddataviewmodel.h | 31 +
src/gui/hosting/battlemaptab.cpp | 2 +-
src/gui/hosting/battlemaptab.h | 18 +-
src/gui/hosting/battleroomdataviewctrl.cpp | 100 +-
src/gui/hosting/battleroomdataviewctrl.h | 7 +-
src/gui/hosting/battleroomdataviewmodel.cpp | 629 +++---
src/gui/hosting/battleroomdataviewmodel.h | 20 +-
src/gui/hosting/battleroomdownloads.cpp | 29 +-
src/gui/hosting/battleroommmoptionstab.cpp | 6 +-
src/gui/hosting/battleroomtab.cpp | 60 +-
src/gui/hosting/battleroomtab.h | 57 +-
src/gui/hosting/hostbattledialog.cpp | 9 +-
src/gui/hosting/hostbattledialog.h | 1 -
src/gui/hosting/ibattlemaptab.cpp | 17 +
src/gui/hosting/ibattlemaptab.h | 30 +
src/gui/hosting/ibattleroomtab.cpp | 17 +
src/gui/hosting/ibattleroomtab.h | 47 +
src/gui/hosting/mainjoinbattletab.cpp | 12 +-
src/gui/hosting/mainjoinbattletab.h | 14 +-
src/gui/hosting/mainsingleplayertab.cpp | 1 +
src/gui/hosting/mmoptionwindows.cpp | 1 +
src/gui/hosting/votepanel.cpp | 13 +-
src/gui/iconscollection.cpp | 129 +-
src/gui/iconscollection.h | 16 +-
src/gui/infodialog.cpp | 2 +-
src/gui/mainchattab.cpp | 2 +-
src/gui/maindownloadtab.cpp | 44 +-
src/gui/maindownloadtab.h | 11 +-
src/gui/mainwindow.cpp | 35 +-
src/gui/mainwindow.h | 2 +-
src/gui/mapctrl.cpp | 71 +-
src/gui/mapctrl.h | 4 +-
src/gui/mapgridctrl.cpp | 31 +-
src/gui/mapgridctrl.h | 3 +-
src/gui/mapselectdialog.cpp | 106 +-
src/gui/mapselectdialog.h | 10 -
src/gui/nickdataviewctrl.cpp | 64 +-
src/gui/nickdataviewmodel.cpp | 268 +--
src/gui/notifications/libnotify.cpp | 1 +
src/gui/notifications/notificationmanager.cpp | 2 +
src/gui/options/downloadoptionspanel.cpp | 18 +-
src/gui/options/springoptionstab.cpp | 3 +-
src/gui/pastedialog.cpp | 8 +-
src/gui/playback/playbackdatamodel.cpp | 150 +-
src/gui/playback/playbackdatamodel.h | 10 +-
src/gui/playback/playbackdataview.cpp | 48 +-
src/gui/playback/playbackdataview.h | 2 +-
src/gui/playback/playbackfilter.cpp | 10 +-
src/gui/playback/playbackfilter.h | 1 +
src/gui/playback/playbacktab.cpp | 74 +-
src/gui/playback/playbacktab.h | 2 +-
src/gui/singleplayertab.cpp | 16 +-
src/gui/statusbar.cpp | 14 +-
src/gui/taskbar.cpp | 191 +-
src/gui/taskbar.h | 25 +-
src/gui/ui.cpp | 377 ++--
src/gui/ui.h | 22 +-
src/gui/uiutils.cpp | 7 +-
src/httpfile.cpp | 4 +-
src/ibattle.cpp | 51 +-
src/ibattle.h | 5 +-
src/iconimagelist.cpp | 249 +--
src/iconimagelist.h | 63 -
src/images/ingame_pw.png.h | 76 +
src/inetclass.h | 3 +-
src/iplaybacklist.cpp | 69 +-
src/iplaybacklist.h | 25 +-
src/iserver.cpp | 3 +-
src/iserver.h | 34 +-
src/log.cpp | 10 +-
src/log.h | 8 +-
src/lsl/.travis.yml | 7 +-
src/lsl/CMakeLists.txt | 30 +-
src/lsl/README | 28 +-
src/lsl/doc/CMakeLists.txt | 2 -
src/lsl/lib/jsoncpp/AUTHORS | 1 +
src/lsl/lib/jsoncpp/LICENSE | 55 +
src/lsl/lib/jsoncpp/README.md | 214 ++
src/lsl/lib/jsoncpp/include/json/assertions.h | 54 +
src/lsl/lib/jsoncpp/include/json/autolink.h | 25 +
src/lsl/lib/jsoncpp/include/json/config.h | 109 ++
src/lsl/lib/jsoncpp/include/json/features.h | 57 +
src/lsl/lib/jsoncpp/include/json/forwards.h | 37 +
src/lsl/lib/jsoncpp/include/json/json.h | 15 +
src/lsl/lib/jsoncpp/include/json/reader.h | 404 ++++
src/lsl/lib/jsoncpp/include/json/value.h | 841 ++++++++
src/lsl/lib/jsoncpp/include/json/version.h | 13 +
src/lsl/lib/jsoncpp/include/json/writer.h | 331 ++++
src/lsl/lib/jsoncpp/src/lib_json/json_reader.cpp | 2035 ++++++++++++++++++++
src/lsl/lib/jsoncpp/src/lib_json/json_tool.h | 87 +
src/lsl/lib/jsoncpp/src/lib_json/json_value.cpp | 1528 +++++++++++++++
.../jsoncpp/src/lib_json/json_valueiterator.inl | 162 ++
src/lsl/lib/jsoncpp/src/lib_json/json_writer.cpp | 1187 ++++++++++++
src/lsl/src/CMakeLists.txt | 6 -
src/lsl/src/lsl/CMakeLists.txt | 2 +-
src/lsl/src/lsl/battle/battle.cpp | 6 +-
src/lsl/src/lsl/battle/ibattle.h | 12 +-
src/lsl/src/lsl/battle/tdfcontainer.h | 6 +-
src/lsl/src/lsl/container/base.h | 3 +-
src/lsl/src/lsl/networking/commands.cpp | 3 +-
src/lsl/src/lsl/networking/commands.h | 27 +-
src/lsl/src/lsl/networking/function_templates.h | 33 +-
src/lsl/src/lsl/networking/iserver.cpp | 3 +-
src/lsl/src/lsl/networking/iserver.h | 6 +-
src/lsl/src/lsl/networking/tasserverdataformats.h | 24 +-
src/lsl/src/lsl/spring/spring.cpp | 21 +-
src/lsl/src/lsl/user/userdata.h | 9 +-
src/lsl/src/lslextract/CMakeLists.txt | 14 +-
src/lsl/src/lslextract/index.html | 100 +
src/lsl/src/lslextract/lslextract.cpp | 47 +-
src/lsl/src/lslextract/server/connection.cpp | 76 +
src/lsl/src/lslextract/server/connection.h | 71 +
.../src/lslextract/server/connection_manager.cpp | 32 +
src/lsl/src/lslextract/server/connection_manager.h | 40 +
src/lsl/src/lslextract/server/header.h | 19 +
src/lsl/src/lslextract/server/mime_types.cpp | 34 +
src/lsl/src/lslextract/server/mime_types.h | 20 +
src/lsl/src/lslextract/server/reply.cpp | 247 +++
src/lsl/src/lslextract/server/reply.h | 54 +
src/lsl/src/lslextract/server/request.h | 25 +
src/lsl/src/lslextract/server/request_handler.cpp | 237 +++
src/lsl/src/lslextract/server/request_handler.h | 39 +
src/lsl/src/lslextract/server/request_parser.cpp | 243 +++
src/lsl/src/lslextract/server/request_parser.h | 88 +
src/lsl/src/lslextract/server/server.cpp | 84 +
src/lsl/src/lslextract/server/server.h | 58 +
src/lsl/src/lslunitsync/CMakeLists.txt | 5 +-
src/lsl/src/lslunitsync/c_api.cpp | 270 +--
src/lsl/src/lslunitsync/c_api.h | 23 +-
src/lsl/src/lslunitsync/data.h | 12 +-
src/lsl/src/lslunitsync/enum.h | 5 -
src/lsl/src/lslunitsync/image.cpp | 85 +-
src/lsl/src/lslunitsync/image.h | 4 +-
src/lsl/src/lslunitsync/loader.cpp | 234 ++-
src/lsl/src/lslunitsync/loader.h | 11 +-
src/lsl/src/lslunitsync/mmoptionmodel.cpp | 46 +-
src/lsl/src/lslunitsync/mmoptionmodel.h | 39 +-
src/lsl/src/lslunitsync/mru_cache.h | 4 +-
src/lsl/src/lslunitsync/optionswrapper.cpp | 7 +-
src/lsl/src/lslunitsync/optionswrapper.h | 3 +-
src/lsl/src/lslunitsync/sharedlib.cpp | 26 +-
src/lsl/src/lslunitsync/sharedlib.h | 1 -
src/lsl/src/lslunitsync/signatures.h | 1 +
src/lsl/src/lslunitsync/springbundle.cpp | 5 +-
src/lsl/src/lslunitsync/unitsync.cpp | 804 ++++----
src/lsl/src/lslunitsync/unitsync.h | 94 +-
src/lsl/src/lslunitsync/unitsync_cache.cpp | 344 ++++
src/lsl/src/lslunitsync/unitsync_cache.h | 48 +
src/lsl/src/lslutils/base64.h | 3 +-
src/lsl/src/lslutils/config.h | 4 +-
src/lsl/src/lslutils/conversion.cpp | 43 +-
src/lsl/src/lslutils/conversion.h | 2 +
src/lsl/src/lslutils/debug.cpp | 1 -
src/lsl/src/lslutils/debug.h | 24 +-
src/lsl/src/lslutils/global_interfaces.h | 3 +-
src/lsl/src/lslutils/globalsmanager.cpp | 2 +-
src/lsl/src/lslutils/globalsmanager.h | 3 +-
src/lsl/src/lslutils/logging.h | 3 -
src/lsl/src/lslutils/md5.h | 3 +-
src/lsl/src/lslutils/misc.cpp | 13 +
src/lsl/src/lslutils/misc.h | 9 +-
src/lsl/src/lslutils/thread.cpp | 3 +-
src/lsl/test/commands.h | 9 +-
src/lsl/test/common.h | 3 +-
src/lsl/test/swig.cpp | 6 +-
src/offlineserver.cpp | 6 +-
src/offlineserver.h | 2 +-
src/playbackthread.cpp | 26 +-
src/playbackthread.h | 8 +-
src/replaylist.cpp | 147 +-
src/replaylist.h | 14 +-
src/savegamelist.cpp | 14 -
src/savegamelist.h | 2 -
src/serverevents.cpp | 110 +-
src/serverevents.h | 4 +-
src/servermanager.cpp | 56 +-
src/servermanager.h | 9 +-
src/settings.h | 2 +-
src/singleplayerbattle.cpp | 9 -
src/socket.cpp | 27 +-
src/socket.h | 3 +-
src/sound/winsound.cpp | 3 +-
src/spring.cpp | 2 +-
src/springlobbyapp.cpp | 20 +-
src/springsettings/frame.cpp | 2 +-
src/tasserver.cpp | 328 ++--
src/tasserver.h | 18 +-
src/tests/CMakeLists.txt | 14 +
src/tests/chatlog.cpp | 16 +
src/tests/config.cpp | 22 +-
src/tests/lslconversion.cpp | 64 +
src/tests/slpaths.cpp | 17 +-
src/tests/testingstuff/silent_logger.h | 50 +
src/tests/utils/globalevents.cpp | 155 ++
src/updatehelper.cpp | 4 +-
src/updater/CMakeLists.txt | 1 +
src/updater/updaterapp.cpp | 2 +-
src/user.cpp | 20 +-
src/useractions.cpp | 6 +-
src/utils/battleevents.cpp | 14 -
src/utils/battleevents.h | 23 -
src/utils/conversion.cpp | 4 +-
src/utils/globalevents.cpp | 128 +-
src/utils/globalevents.h | 12 +-
src/utils/slpaths.cpp | 38 +-
src/utils/tasutil.cpp | 39 +-
src/utils/tasutil.h | 16 +-
src/utils/uievents.h | 4 +-
src/utils/wxTranslationHelper.cpp | 1 +
tools/latest.sh | 5 +-
tools/mxe_create_builddir.sh | 9 +-
313 files changed, 14897 insertions(+), 6356 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