This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository springlobby.
commit e4508f2ba4da7624b93a20621e2b022d876c21ea Merge: fd69a77 55ea8e0 Author: Markus Koschany <[email protected]> Date: Tue Apr 19 09:15:03 2016 +0200 Merge tag 'upstream/0.245+dfsg' Upstream version 0.245+dfsg # gpg: Signature made Tue 19 Apr 2016 09:14:58 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] ChangeLog | 7 ++++ VERSION | 2 +- springlobby_config.h | 2 +- src/CMakeLists.txt | 2 - src/downloader/lib/.travis.yml | 10 ++--- src/downloader/lib/CMakeLists.txt | 18 +++++++-- src/downloader/lib/src/CMakeLists.txt | 4 +- src/gui/hosting/battlemaptab.cpp | 2 +- src/gui/hosting/battlemaptab.h | 18 ++++----- src/gui/hosting/battleroomtab.cpp | 4 +- src/gui/hosting/battleroomtab.h | 47 +++++++++++++---------- 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 | 12 +++--- src/gui/hosting/votepanel.cpp | 3 +- src/gui/mainwindow.cpp | 11 +++++- src/gui/mainwindow.h | 2 +- src/gui/ui.cpp | 8 ++-- src/lsl/.travis.yml | 14 ++----- src/lsl/CMakeLists.txt | 19 +++++++-- src/lsl/cmake/FindJsoncpp.cmake | 26 +++++++++++++ src/lsl/src/lslextract/CMakeLists.txt | 5 +-- src/lsl/src/lslextract/server/request_handler.cpp | 2 +- src/lsl/src/lslunitsync/CMakeLists.txt | 4 +- src/lsl/src/lslunitsync/c_api.cpp | 4 +- src/lsl/src/lslunitsync/image.cpp | 38 +++++++++++++----- src/lsl/src/lslunitsync/sharedlib.cpp | 4 +- src/lsl/test/CMakeLists.txt | 2 +- src/lsl/test/basic.cpp | 2 + src/serverevents.cpp | 4 ++ src/useractions.cpp | 2 +- 34 files changed, 184 insertions(+), 217 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
