This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository springlobby.
commit c919ec35d56aa7505b6d88fa61ecafa5f71dc102 Merge: 810abd2 2921fb6 Author: Markus Koschany <[email protected]> Date: Tue Jun 2 20:47:30 2015 +0200 Merge tag 'upstream/0.224' Upstream version 0.224 # gpg: Signature made Tue 02 Jun 2015 20:47:25 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] ChangeLog | 10 +++ VERSION | 2 +- springlobby_config.h | 2 +- src/CMakeLists.txt | 1 + src/autohost.h | 3 +- src/autohostmanager.cpp | 18 ++++++ src/autohostmanager.h | 5 +- src/battle.cpp | 13 ---- src/gui/infodialog.cpp | 1 - src/gui/infodialog.h | 1 + src/gui/mapselectdialog.cpp | 1 - src/gui/selectusersdialog.cpp | 1 - src/gui/singleplayertab.cpp | 83 +++++++++++++----------- src/gui/singleplayertab.h | 5 ++ src/gui/sltipwin.cpp | 36 +++++------ src/gui/sltipwin.h | 8 +-- src/gui/textentrydialog.cpp | 40 ++++++++++++ src/gui/textentrydialog.h | 40 ++---------- src/ibattle.cpp | 34 ++++++---- src/log.cpp | 14 +--- src/lsl/lib/cimg/CImg.h | 5 +- src/lsl/src/lslutils/conversion.h | 2 +- src/serverevents.cpp | 132 +++++++++++++++++++++++--------------- src/tasserver.cpp | 23 ++++--- src/tasserver.h | 2 +- src/tests/lslconversion.cpp | 21 ++++++ 26 files changed, 295 insertions(+), 208 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
