This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository springlobby.
commit edb4a4b3588e13aae70a018ee27fa7e421860a67 Merge: 7f42fa0 245bd4d Author: Markus Koschany <[email protected]> Date: Thu Apr 30 22:06:42 2015 +0200 Merge tag 'upstream/0.218' Upstream version 0.218 # gpg: Signature made Thu 30 Apr 2015 22:06:37 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] .travis.yml | 9 +- ChangeLog | 8 + VERSION | 2 +- springlobby_config.h | 2 +- src/channel.cpp | 2 +- src/channel.h | 2 +- src/downloader/lib/CMakeLists.txt | 2 +- src/downloader/lib/src/CMakeLists.txt | 17 +- src/downloader/lib/src/lib/minizip/CMakeLists.txt | 1 + src/downloader/lib/src/lib/minizip/crypt.h | 132 -- src/downloader/lib/src/lib/minizip/ioapi.c | 228 ++- src/downloader/lib/src/lib/minizip/ioapi.h | 189 +- src/downloader/lib/src/lib/minizip/unzip.c | 1302 +++++++++----- src/downloader/lib/src/lib/minizip/unzip.h | 131 +- src/downloader/lib/src/lib/minizip/zip.c | 1841 ++++++++++++++------ src/downloader/lib/src/lib/minizip/zip.h | 175 +- src/downloader/prdownloader.cpp | 17 +- src/gui/battlelist/battlelisttab.cpp | 3 +- src/gui/battlelist/battlelisttab.h | 2 +- src/gui/channel/autojoinchanneldialog.cpp | 8 +- src/gui/chatpanel.cpp | 6 +- src/gui/chatpanelmenu.cpp | 26 +- src/gui/chatpanelmenu.h | 1 - src/gui/connectwindow.cpp | 5 +- src/gui/contentdownloaddialog.cpp | 1 + src/gui/controls.cpp | 10 +- src/gui/controls.h | 23 - src/gui/customlistctrl.cpp | 2 +- src/gui/customvirtlistctrl.cpp | 111 +- src/gui/customvirtlistctrl.h | 14 +- src/gui/hosting/addbotdialog.cpp | 2 +- src/gui/hosting/autobalancedialog.cpp | 2 +- src/gui/hosting/battlemaptab.cpp | 3 +- src/gui/hosting/battlemaptab.h | 2 +- src/gui/hosting/battleoptionstab.cpp | 10 +- src/gui/hosting/battleroommmoptionstab.cpp | 20 +- src/gui/hosting/battleroomtab.cpp | 65 +- src/gui/hosting/battleroomtab.h | 6 +- src/gui/hosting/hostbattledialog.cpp | 34 +- src/gui/hosting/hostbattledialog.h | 4 +- src/gui/hosting/mainjoinbattletab.cpp | 3 +- src/gui/hosting/mainjoinbattletab.h | 2 +- src/gui/hosting/mainsingleplayertab.cpp | 3 +- src/gui/hosting/mainsingleplayertab.h | 2 +- src/gui/hosting/mmoptionwindows.cpp | 8 +- src/gui/mainchattab.cpp | 29 +- src/gui/mainchattab.h | 2 +- src/gui/maindownloadtab.cpp | 3 +- src/gui/maindownloadtab.h | 2 +- src/gui/mainwindow.cpp | 2 +- .../notifications/toasterbox/ToasterBoxWindow.cpp | 6 +- src/gui/options/chatoptionstab.cpp | 6 +- src/gui/options/chatoptionstab.h | 2 +- src/gui/options/groupoptionspanel.cpp | 2 +- src/gui/options/lobbyoptionstab.cpp | 10 +- src/gui/playback/playbacklistctrl.cpp | 3 +- src/gui/playback/playbacktab.cpp | 5 +- src/gui/playback/playbacktab.h | 2 +- src/gui/singleplayertab.cpp | 7 +- src/gui/singleplayertab.h | 2 +- src/gui/uiutils.cpp | 8 +- src/gui/uiutils.h | 3 + src/lsl/src/lslunitsync/springbundle.cpp | 1 + src/settings.cpp | 43 +- src/settings.h | 17 +- src/springsettings/frame.cpp | 26 +- 66 files changed, 3129 insertions(+), 1490 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
