This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository springlobby.
commit e5514adbb73e6f46e074b6353b1a678ebbd5fc26 Merge: fb9f0ee e2426b9 Author: Markus Koschany <[email protected]> Date: Fri May 15 23:00:25 2015 +0200 Merge tag 'upstream/0.219' Upstream version 0.219 # gpg: Signature made Fri 15 May 2015 23:00:21 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] .travis.yml | 17 +- CMakeLists.txt | 14 + ChangeLog | 8 + VERSION | 2 +- po/CMakeLists.txt | 2 +- po/ar.po | 6238 +++++++------- po/cs.po | 7448 ++++++++--------- po/da.po | 7288 ++++++++--------- po/de.po | 8025 +++++++++--------- po/el.po | 8495 ++++++++++---------- po/es.po | 7274 ++++++++--------- po/fi.po | 7236 ++++++++--------- po/fr.po | 7858 +++++++++--------- po/it.po | 7915 +++++++++--------- po/pl.po | 6280 +++++++-------- po/pt.po | 6861 ++++++++-------- po/ro.po | 8084 +++++++++---------- po/ru.po | 7719 +++++++++--------- po/springlobby.pot | 5684 ++++++------- po/sv.po | 7088 ++++++++-------- po/uk.po | 6749 +++++++--------- po/zh_CN.po | 7278 ++++++++--------- springlobby_config.h | 2 +- src/CMakeLists.txt | 30 +- src/crashreport.cpp | 2 +- src/downloader/downloadsobserver.cpp | 1 + src/downloader/lib/src/CMakeLists.txt | 8 +- .../lib/src/Downloader/Rapid/RapidDownloader.cpp | 2 + src/downloader/lib/src/Downloader/Rapid/Repo.cpp | 1 + src/downloader/lib/src/FileSystem/AtomicFile.cpp | 2 +- src/downloader/lib/src/FileSystem/FileSystem.cpp | 2 + src/downloader/lib/src/Version.cpp | 2 +- src/downloader/lib/src/Version.h | 18 - .../lib/src/lib/xmlrpc++/src/XmlRpcValue.cpp | 1 + src/gui/battlelist/battlelisttab.cpp | 32 +- src/gui/chatpanel.cpp | 20 +- src/gui/chatpanel.h | 8 +- src/gui/chatpanelmenu.cpp | 10 +- src/gui/chatpanelmenu.h | 3 - src/gui/customlistctrl.cpp | 323 - src/gui/customlistctrl.h | 171 - src/gui/customvirtlistctrl.cpp | 32 +- src/gui/customvirtlistctrl.h | 16 +- src/gui/hosting/battleroommmoptionstab.cpp | 2 +- src/gui/hosting/battleroomtab.cpp | 27 +- src/gui/hosting/battleroomtab.h | 4 + src/gui/hosting/mmoptionwindows.cpp | 11 +- src/gui/hosting/votepanel.cpp | 200 + src/gui/hosting/votepanel.h | 63 + src/gui/infodialog.cpp | 1 - src/gui/mapctrl.cpp | 43 +- src/gui/mapselectdialog.cpp | 105 +- src/gui/mapselectdialog.h | 12 +- src/gui/nicklistctrl.cpp | 7 +- src/gui/nicklistctrl.h | 4 +- src/gui/notifications/notificationmanager.cpp | 2 +- src/gui/notifications/toasterbox/ToasterBox.cpp | 2 +- src/gui/playback/playbackfilter.cpp | 1 + src/gui/singleplayertab.cpp | 2 +- src/gui/slbook.cpp | 16 +- src/gui/slbook.h | 4 - src/gui/ui.cpp | 4 +- src/gui/uiutils.cpp | 6 +- src/ibattle.cpp | 39 +- src/inetclass.h | 3 + src/iserver.h | 5 +- src/log.h | 8 +- src/lsl/lib/cimg/CImg.h | 5 +- src/lsl/src/lslunitsync/c_api.cpp | 146 +- src/lsl/src/lslunitsync/c_api.h | 29 +- src/lsl/src/lslunitsync/image.cpp | 1 + src/lsl/src/lslunitsync/image.h | 11 +- src/lsl/src/lslunitsync/loader.cpp | 14 +- src/lsl/src/lslunitsync/optionswrapper.cpp | 18 +- src/lsl/src/lslunitsync/sharedlib.cpp | 2 +- src/lsl/src/lslunitsync/signatures.h | 7 + src/lsl/src/lslunitsync/unitsync.cpp | 809 +- src/lsl/src/lslunitsync/unitsync.h | 243 +- src/lsl/src/lslutils/conversion.h | 8 + src/lsl/src/lslutils/globalsmanager.h | 5 + src/lsl/src/lslutils/misc.cpp | 14 +- src/offlinebattle.h | 8 +- src/offlineserver.cpp | 76 + src/offlineserver.h | 29 + src/serverevents.cpp | 4 + src/singleplayerbattle.h | 12 +- src/socket.cpp | 8 +- src/socket.h | 4 +- src/springprocess.cpp | 9 - src/springsettings/frame.cpp | 5 +- src/storedgame.h | 1 + src/tasserver.cpp | 183 +- src/tasserver.h | 148 +- src/tests/lslconversion.cpp | 61 + src/user.h | 60 + src/userlist.cpp | 8 +- src/utils/CMakeLists.txt | 11 - src/utils/version.cpp | 11 +- src/utils/version.h | 1 - 99 files changed, 60469 insertions(+), 66302 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
