This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository bzflag.
commit d3308f808bb7afd9b09041f34a75e32a3487d904 Merge: df07aba 468b88b Author: Markus Koschany <[email protected]> Date: Sun Dec 4 00:50:06 2016 +0100 Merge tag 'upstream/2.4.8' Upstream version 2.4.8 # gpg: Signatur vom So 04 Dez 2016 00:50:04 CET # gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4 # gpg: Korrekte Signatur von "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] .travis.yml | 21 - AUTHORS | 3 + ChangeLog | 18 + MSVC/build/3D.vcxproj | 8 +- MSVC/build/Makefile.am | 2 - MSVC/build/bzadmin.vcxproj | 10 +- MSVC/build/bzflag.vcxproj | 10 +- MSVC/build/bzfs.vcxproj | 8 +- MSVC/build/common.vcxproj | 10 +- MSVC/build/date.vcxproj | 8 +- MSVC/build/game.vcxproj | 8 +- MSVC/build/geometry.vcxproj | 8 +- MSVC/build/installer.vcxproj | 5 +- MSVC/build/mediafile.vcxproj | 8 +- MSVC/build/net.vcxproj | 8 +- MSVC/build/obstacle.vcxproj | 8 +- MSVC/build/ogl.vcxproj | 8 +- MSVC/build/platform.vcxproj | 8 +- MSVC/build/scene.vcxproj | 2 +- MSVC/build/tests.vcxproj | 214 -- MSVC/build/tests.vcxproj.filters | 31 - MSVC/bzflag.rc | 8 +- MSVC/fullbuild.sln | 29 - Makefile.am | 6 +- README | 2 +- README.WINDOWS | 10 - Xcode/BZFlag.xcodeproj/project.pbxproj | 102 +- configure.ac | 123 +- data/bzflag.desktop | 1 + data/l10n/Makefile.am | 1 + data/l10n/bzflag_ru.po | 3250 +++++++++++++++++++++++++++++ data/title.png | Bin 91775 -> 110082 bytes misc/art/title.psd | Bin 375912 -> 381705 bytes package/Makefile.am | 5 - package/win32/nsis/BZFlag.nsi | 2 +- plugins/plugin_utils/plugin_utils.vcxproj | 2 +- src/bzadmin/BZAdminClient.cxx | 3 + src/bzadmin/Makefile.am | 4 +- src/{bzflag => bzadmin}/ServerLink.cxx | 201 -- src/{bzflag => bzadmin}/ServerLink.h | 21 - src/bzadmin/bzadmin.cxx | 5 - src/bzflag/ControlPanel.cxx | 8 +- src/bzflag/Makefile.am | 6 - src/bzflag/ServerLink.cxx | 2 - src/bzflag/ServerLink.h | 2 - src/bzflag/ServerMenu.cxx | 8 +- src/bzflag/bzflag.cxx | 39 - src/bzflag/playing.cxx | 58 +- src/bzflag/sound.cxx | 4 +- src/bzfs/AccessControlList.cxx | 6 +- src/bzfs/CmdLineOptions.cxx | 31 +- src/bzfs/CmdLineOptions.h | 3 +- src/bzfs/bzfs.cxx | 30 +- src/bzfs/bzfsAPI.cxx | 2 +- src/bzfs/commands.cxx | 11 +- src/date/buildDate.cxx | 2 +- src/obstacle/Teleporter.cxx | 3 +- src/platform/SDL2Display.cxx | 2 + tests/Makefile.am | 25 - tests/bans.cxx | 114 - tests/tests.cxx | 29 - 61 files changed, 3484 insertions(+), 1082 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/bzflag.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
