This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository chocolate-doom.
commit 19b143d1e7f8e1126a43ec0ad057319150fec820 Merge: 06ecb58 1477cf1 Author: Fabian Greffrath <[email protected]> Date: Fri Sep 18 09:25:23 2015 +0200 Merge tag 'upstream/2.2.1' Upstream version 2.2.1 NEWS | 42 ++++++++ README.Strife | 70 ++------------ codeblocks/config.h | 6 +- codeblocks/game-res.rc | 10 +- codeblocks/setup-res.rc | 8 +- configure.ac | 18 +++- man/Makefile.am | 1 + man/doom.template | 2 + man/environ.man | 5 +- man/heretic.template | 2 + man/hexen.template | 2 + man/iwad_paths.man | 48 +++++++++ man/strife.template | 2 + msvc/config.h | 6 +- msvc/doom.vcproj | 4 + msvc/heretic.vcproj | 4 - msvc/hexen.vcproj | 8 -- msvc/win32.rc | 8 +- pkg/osx/Info.plist.in | 6 ++ src/.gitignore | 1 + src/Makefile.am | 19 ++++ src/d_iwad.c | 209 +++++++++++++++++++++++++++------------- src/doom.appdata.xml.in | 45 +++++++++ src/doom/g_game.c | 17 ++-- src/doomtype.h | 6 ++ src/heretic.appdata.xml.in | 44 +++++++++ src/heretic/d_main.c | 1 - src/heretic/g_game.c | 1 - src/hexen.appdata.xml.in | 44 +++++++++ src/hexen/g_game.c | 1 - src/hexen/h2_main.c | 1 - src/setup/multiplayer.c | 13 ++- src/setup/setup-manifest.xml.in | 1 + src/setup/setup.desktop.in | 3 +- src/strife.appdata.xml.in | 45 +++++++++ src/strife/g_game.c | 1 - 36 files changed, 520 insertions(+), 184 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
