This is an automated email from the git hooks/post-receive script. fabian pushed a commit to branch master in repository chocolate-doom.
commit 085492007636dddeefdfbcbae594cfc485649158 Merge: b069d2f 965fdcf Author: Fabian Greffrath <[email protected]> Date: Fri Jun 12 14:42:38 2015 +0200 Merge tag 'upstream/2.2.0' Upstream version 2.2.0 HACKING | 14 +- NEWS | 115 +++ PHILOSOPHY | 32 +- codeblocks/config.h | 6 +- codeblocks/doom.cbp | 3 + codeblocks/game-res.rc | 10 +- codeblocks/setup-res.rc | 8 +- configure.ac | 6 +- data/Makefile.am | 4 +- man/Makefile.am | 98 ++- man/chocolate-server.6 | 2 +- man/docgen | 2 + man/environ.man | 2 +- msvc/config.h | 6 +- msvc/win32.rc | 8 +- opl/dbopl.h | 1 + opl/examples/Makefile.am | 2 +- opl/examples/droplay.c | 1 + opl/opl.c | 111 ++- opl/opl.h | 19 +- opl/opl_sdl.c | 41 +- src/Makefile.am | 6 +- src/aes_prng.c | 1717 +++++++++++++++++------------------- src/d_iwad.c | 14 +- src/d_loop.c | 27 +- src/deh_io.c | 8 +- src/doom.desktop.in | 1 + src/doom/Makefile.am | 2 +- src/doom/d_main.c | 38 +- src/doom/d_player.h | 2 +- src/doom/doom.desktop.in | 7 - src/doom/g_game.c | 37 +- src/doom/p_floor.c | 6 + src/doom/p_inter.c | 15 +- src/doom/p_map.c | 2 +- src/doom/p_maputl.c | 4 +- src/doom/p_saveg.c | 4 +- src/doom/p_setup.c | 5 +- src/doom/p_tick.c | 8 +- src/doom/s_sound.c | 4 +- src/doom/st_stuff.c | 11 +- src/doomtype.h | 4 + src/gusconf.c | 5 +- src/gusconf.h | 2 +- src/heretic.desktop.in | 1 + src/heretic/Makefile.am | 10 +- src/heretic/d_main.c | 23 +- src/heretic/f_finale.c | 4 +- src/heretic/g_game.c | 13 +- src/heretic/i_ibm.c | 1642 ---------------------------------- src/heretic/i_sound.c | 426 --------- src/heretic/in_lude.c | 13 +- src/heretic/mn_menu.c | 1 + src/heretic/p_enemy.c | 4 +- src/heretic/p_map.c | 2 +- src/heretic/p_maputl.c | 2 +- src/heretic/p_pspr.c | 2 +- src/heretic/p_saveg.c | 2 + src/heretic/p_tick.c | 6 +- src/heretic/r_things.c | 2 +- src/heretic/s_sound.c | 1 + src/heretic/sb_bar.c | 7 +- src/hexen.desktop.in | 1 + src/hexen/Makefile.am | 10 +- src/hexen/a_action.c | 13 +- src/hexen/am_map.c | 16 +- src/hexen/ct_chat.c | 6 +- src/hexen/d_net.c | 6 +- src/hexen/f_finale.c | 5 +- src/hexen/g_game.c | 45 +- src/hexen/h2_main.c | 99 ++- src/hexen/h2def.h | 1 + src/hexen/i_header.h | 92 -- src/hexen/i_ibm.c | 1837 --------------------------------------- src/hexen/i_sound.c | 402 --------- src/hexen/in_lude.c | 17 +- src/hexen/m_misc.c | 21 - src/hexen/mn_menu.c | 4 +- src/hexen/p_acs.c | 29 +- src/hexen/p_enemy.c | 43 +- src/hexen/p_inter.c | 11 +- src/hexen/p_map.c | 14 +- src/hexen/p_maputl.c | 2 +- src/hexen/p_mobj.c | 6 +- src/hexen/p_setup.c | 14 +- src/hexen/p_spec.c | 16 +- src/hexen/p_switch.c | 23 +- src/hexen/p_tick.c | 14 +- src/hexen/p_user.c | 4 +- src/hexen/r_data.c | 2 +- src/hexen/r_draw.c | 4 +- src/hexen/r_things.c | 6 +- src/hexen/s_sound.c | 1 + src/hexen/sb_bar.c | 47 +- src/hexen/sv_save.c | 52 +- src/i_joystick.c | 18 +- src/i_main.c | 96 -- src/i_oplmusic.c | 489 ++++++++--- src/i_scale.c | 77 +- src/i_scale.h | 2 +- src/i_sdlmusic.c | 64 +- src/i_sdlsound.c | 4 +- src/i_sound.c | 37 +- src/i_sound.h | 8 + src/i_video.c | 50 +- src/m_config.c | 75 +- src/m_config.h | 6 +- src/m_controls.c | 250 +++--- src/m_misc.c | 30 +- src/m_misc.h | 1 + src/midifile.c | 8 +- src/net_client.c | 6 +- src/net_gui.c | 15 +- src/net_query.c | 3 +- src/net_sdl.c | 28 +- src/net_server.c | 5 +- src/net_structrw.c | 6 +- src/resource.rc.in | 4 +- src/setup-res.rc.in | 4 +- src/setup/Makefile.am | 2 +- src/setup/compatibility.c | 10 +- src/setup/display.c | 33 +- src/setup/execute.c | 3 +- src/setup/joystick.c | 119 ++- src/setup/keyboard.c | 10 +- src/setup/mainmenu.c | 6 +- src/setup/mode.c | 19 +- src/setup/mouse.c | 18 +- src/setup/multiplayer.c | 62 +- src/setup/sound.c | 152 +++- src/setup/txt_joyaxis.c | 4 + src/sha1.c | 6 +- src/strife.desktop.in | 1 + src/strife/Makefile.am | 2 +- src/strife/am_map.c | 22 +- src/strife/d_englsh.h | 4 +- src/strife/d_main.c | 49 +- src/strife/f_finale.c | 8 +- src/strife/g_game.c | 16 +- src/strife/hu_stuff.c | 6 +- src/strife/m_menu.c | 2 +- src/strife/p_dialog.c | 1 + src/strife/p_enemy.c | 12 +- src/strife/p_inter.c | 15 +- src/strife/p_map.c | 2 +- src/strife/p_maputl.c | 2 +- src/strife/p_saveg.c | 4 +- src/strife/p_setup.c | 7 +- src/strife/p_switch.c | 9 +- src/strife/p_tick.c | 7 +- src/strife/r_things.c | 14 +- src/strife/s_sound.c | 8 +- src/strife/st_stuff.c | 4 +- src/w_wad.c | 87 +- src/w_wad.h | 1 + src/z_zone.c | 86 +- textscreen/Makefile.am | 2 +- textscreen/examples/Makefile.am | 2 +- textscreen/examples/guitest.c | 2 + textscreen/txt_desktop.c | 86 +- textscreen/txt_desktop.h | 2 +- textscreen/txt_gui.c | 4 +- textscreen/txt_io.c | 4 +- textscreen/txt_sdl.c | 18 +- textscreen/txt_window.c | 90 +- textscreen/txt_window.h | 22 + textscreen/txt_window_action.c | 1 + 167 files changed, 3247 insertions(+), 6529 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
