This is an automated email from the git hooks/post-receive script.
jmtd pushed a commit to branch jmtd-proposed
in repository chocolate-doom.
commit 6533380043f031dc0259b3ad453274a01e470016
Merge: 9bff311 4b9e555
Author: Jonathan Dowland <jmtd at debian.org>
Date: Tue Jan 9 14:54:36 2018 +0000
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
.github/CONTRIBUTING.md | 98 -
.gitignore | 39 -
.travis.yml | 30 -
CODE_OF_CONDUCT.md | 74 -
HACKING.md | 1 +
man/INSTALL.template => INSTALL | 171 +-
Makefile.am | 2 +-
Makefile.in | 1012 +++
NEWS.md | 83 +
README.Music.md | 20 +-
README.md | 2 +-
acinclude.m4 | 36 -
aclocal.m4 | 1457 ++++
autogen.sh | 4 -
autotools/compile | 347 +
autotools/config.guess | 1462 ++++
autotools/config.sub | 1825 +++++
autotools/depcomp | 791 +++
autotools/install-sh | 508 ++
autotools/missing | 215 +
codeblocks/config.h | 6 +-
codeblocks/doom.cbp | 15 +-
codeblocks/game-res.rc | 10 +-
codeblocks/heretic.cbp | 18 +-
codeblocks/hexen.cbp | 19 +-
codeblocks/libopl.cbp | 42 +-
codeblocks/libpcsound.cbp | 24 +-
codeblocks/libtextscreen.cbp | 9 +-
codeblocks/server.cbp | 78 +-
codeblocks/setup-res.rc | 8 +-
codeblocks/setup.cbp | 156 +-
codeblocks/strife.cbp | 15 +-
config.hin | 96 +
configure | 7214 ++++++++++++++++++++
configure.ac | 147 +-
data/.gitignore | 4 -
data/Makefile.in | 510 ++
data/convert-icon | 17 +-
data/doom.png | Bin 7332 -> 23029 bytes
data/setup.png | Bin 7397 -> 24247 bytes
man/.gitignore | 12 -
man/INSTALL | 142 +
man/INSTALL.template | 26 +-
man/Makefile.am | 95 +-
man/Makefile.in | 971 +++
man/bash-completion/.gitignore | 4 -
man/bash-completion/Makefile.am | 12 +-
man/bash-completion/Makefile.in | 539 ++
man/bash-completion/chocolate-doom | 116 +
man/bash-completion/chocolate-heretic | 118 +
man/bash-completion/chocolate-hexen | 118 +
man/bash-completion/chocolate-strife | 158 +
man/bash-completion/doom.template | 2 +-
.../{doom.template => doom.template.in} | 6 +-
man/bash-completion/heretic.template | 2 +-
.../{heretic.template => heretic.template.in} | 6 +-
man/bash-completion/hexen.template | 2 +-
.../{hexen.template => hexen.template.in} | 6 +-
man/bash-completion/strife.template | 2 +-
.../{strife.template => strife.template.in} | 6 +-
man/chocolate-doom-setup.6 | 42 +
man/chocolate-doom.6 | 346 +
man/chocolate-doom.cfg.5 | 407 ++
man/chocolate-heretic-setup.6 | 42 +
man/chocolate-heretic.6 | 309 +
man/chocolate-heretic.cfg.5 | 401 ++
man/chocolate-hexen-setup.6 | 42 +
man/chocolate-hexen.6 | 306 +
man/chocolate-hexen.cfg.5 | 434 ++
man/chocolate-strife-setup.6 | 42 +
man/chocolate-strife.6 | 385 ++
man/chocolate-strife.cfg.5 | 422 ++
man/default.cfg.5 | 184 +
man/default.cfg.template | 4 +-
man/docgen | 34 +-
man/doom.template | 6 +-
man/extra.cfg.template | 4 +-
man/heretic.cfg.5 | 205 +
man/heretic.template | 4 +-
man/hexen.cfg.5 | 220 +
man/hexen.template | 4 +-
man/simplecpp | 3 +-
man/strife.cfg.5 | 238 +
man/strife.template | 4 +-
midiproc/Makefile.am | 11 +
midiproc/Makefile.in | 499 ++
midiproc/buffer.c | 253 +
midiproc/buffer.h | 54 +
midiproc/main.c | 467 ++
pkg/osx/IWADLocation.h => midiproc/proto.h | 67 +-
msvc/.gitignore | 11 -
msvc/config.h | 6 +-
msvc/doom.vcproj | 4 +-
msvc/heretic.vcproj | 4 +-
msvc/hexen.vcproj | 4 +-
msvc/server.vcproj | 4 +-
msvc/setup.vcproj | 4 +-
msvc/strife.vcproj | 4 +-
msvc/win32.rc | 8 +-
opl/.gitignore | 7 -
opl/Makefile.in | 704 ++
opl/examples/.gitignore | 7 -
opl/examples/Makefile.in | 558 ++
opl/opl_timer.c | 2 +-
pcsound/.gitignore | 8 -
pcsound/Makefile.in | 578 ++
pcsound/pcsound_bsd.c | 3 +-
pcsound/pcsound_linux.c | 5 +-
pcsound/pcsound_win32.c | 9 +-
pkg/.gitignore | 3 -
pkg/Makefile.am | 4 +-
pkg/Makefile.in | 462 ++
pkg/config.make.in | 2 +
pkg/osx/.gitignore | 7 -
pkg/osx/GNUmakefile | 34 +-
pkg/osx/IWADController.h | 1 +
pkg/osx/IWADController.m | 39 +-
pkg/osx/IWADLocation.m | 66 -
pkg/osx/Info-gnustep.plist.in | 36 -
pkg/osx/Info.plist.in | 2 +
pkg/osx/Resources/launcher.nib/designable.nib | 4133 ++---------
pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 32366 -> 23971 bytes
pkg/osx/disk/background.png | Bin 42578 -> 227363 bytes
pkg/osx/dmgfix | 10 +-
pkg/win32/GNUmakefile | 21 +-
pkg/win32/cp-with-libs | 175 +
rpm.spec | 121 +
src/.gitignore | 21 -
src/Makefile.am | 90 +-
src/Makefile.in | 1393 ++++
src/d_event.h | 53 +-
src/d_iwad.c | 20 +-
src/d_loop.c | 16 -
src/deh_main.h | 1 -
src/deh_str.h | 7 +-
src/doom/.gitignore | 5 -
src/doom/Makefile.am | 27 +-
src/doom/Makefile.in | 709 ++
src/doom/am_map.c | 6 +-
src/doom/d_main.c | 36 +-
src/doom/d_net.c | 12 +-
src/doom/deh_misc.h | 40 +-
src/doom/deh_sound.c | 1 -
src/doom/doomdata.h | 32 +-
src/doom/f_finale.c | 6 +-
src/doom/f_wipe.c | 34 +-
src/doom/g_game.c | 1 +
src/doom/hu_stuff.c | 45 +-
src/doom/m_menu.c | 119 +-
src/doom/p_mobj.c | 9 +-
src/doom/p_setup.c | 4 +-
src/doom/p_switch.c | 69 +-
src/doom/r_data.c | 8 +-
src/doom/r_defs.h | 2 +-
src/doom/r_draw.c | 30 +-
src/doom/s_sound.c | 1 -
src/doom/st_stuff.c | 4 +-
src/doomfeatures.h | 40 -
src/doomkeys.h | 60 +
src/doomtype.h | 20 +-
src/heretic/.gitignore | 6 -
src/heretic/Makefile.am | 21 +-
src/heretic/Makefile.in | 682 ++
src/heretic/ct_chat.c | 7 +-
src/heretic/d_main.c | 87 +-
src/heretic/d_net.c | 2 -
src/heretic/deh_sound.c | 1 -
src/heretic/doomdata.h | 40 +-
src/heretic/f_finale.c | 3 -
src/heretic/g_game.c | 31 +-
src/heretic/mn_menu.c | 21 +-
src/heretic/p_switch.c | 41 +-
src/heretic/r_bsp.c | 1 +
src/hexen/.gitignore | 5 -
src/hexen/Makefile.am | 3 +-
src/hexen/Makefile.in | 681 ++
src/hexen/ct_chat.c | 7 +-
src/hexen/d_net.c | 2 -
src/hexen/g_game.c | 31 +-
src/hexen/h2_main.c | 44 +-
src/hexen/mn_menu.c | 20 +-
src/hexen/p_acs.c | 4 +-
src/hexen/xddefs.h | 40 +-
src/i_cdmus.c | 157 +-
src/i_endoom.c | 6 +-
src/i_input.c | 468 ++
src/i_input.h | 42 +
src/i_joystick.c | 82 +-
src/i_midipipe.c | 477 ++
src/i_midipipe.h | 48 +
src/i_oplmusic.c | 12 +-
src/i_scale.c | 1391 ----
src/i_scale.h | 53 -
src/i_sdlmusic.c | 111 +-
src/i_sdlsound.c | 57 +-
src/i_sound.c | 25 +-
src/i_system.c | 150 +-
src/i_system.h | 2 +
src/i_video.c | 1900 ++----
src/i_video.h | 76 +-
src/i_videohr.c | 25 +-
src/icon.c | 2994 +++++++-
src/m_config.c | 457 +-
src/midifile.c | 17 +-
src/mus2mid.c | 4 +-
src/net_client.c | 51 +-
src/net_common.c | 89 +-
src/net_common.h | 31 +-
src/net_dedicated.c | 2 +-
src/net_defs.h | 30 +-
src/net_packet.c | 34 +-
src/net_packet.h | 3 +-
src/net_query.c | 10 +-
src/net_server.c | 197 +-
src/net_structrw.c | 152 +-
src/net_structrw.h | 8 +-
src/resource.rc | 30 +
src/resource.rc.in | 2 +
src/setup-res.rc | 28 +
src/setup/.gitignore | 7 -
src/setup/Makefile.am | 8 +-
src/setup/Makefile.in | 673 ++
src/setup/display.c | 651 +-
src/setup/execute.c | 2 +
src/setup/joystick.c | 251 +-
src/setup/mainmenu.c | 80 +-
src/setup/multiplayer.c | 42 +-
src/setup/setup_icon.c | 2994 +++++++-
src/setup/sound.c | 316 +-
src/setup/txt_joyaxis.c | 16 +-
src/setup/txt_joybinput.c | 3 +-
src/setup/txt_keyinput.c | 25 +-
src/setup/txt_mouseinput.c | 3 +-
src/strife/.gitignore | 5 -
src/strife/Makefile.am | 29 +-
src/strife/Makefile.in | 712 ++
src/strife/d_main.c | 282 +-
src/strife/d_net.c | 2 -
src/strife/deh_misc.h | 40 +-
src/strife/deh_sound.c | 1 -
src/strife/doomdata.h | 32 +-
src/strife/g_game.c | 9 +-
src/strife/hu_stuff.c | 29 +-
src/strife/m_menu.c | 30 +-
src/strife/m_saves.c | 2 +
src/strife/p_mobj.c | 7 +
src/strife/p_setup.c | 4 +-
src/strife/p_switch.c | 44 +-
src/strife/r_data.c | 8 +-
src/strife/s_sound.c | 1 -
src/v_patch.h | 20 +-
src/v_video.c | 84 +-
src/v_video.h | 6 +-
src/w_checksum.c | 3 +-
src/w_main.c | 5 -
src/w_wad.c | 16 +-
textscreen/.gitignore | 6 -
textscreen/Makefile.am | 8 +-
textscreen/Makefile.in | 742 ++
textscreen/examples/.gitignore | 8 -
textscreen/examples/Makefile.in | 568 ++
textscreen/examples/guitest.c | 30 +-
textscreen/fonts/Makefile.am | 18 +
textscreen/fonts/Makefile.in | 447 ++
textscreen/fonts/README | 38 +
textscreen/fonts/codepage.h | 113 +
textscreen/fonts/convert-font | 104 +
textscreen/fonts/large.h | 2060 ++++++
textscreen/fonts/large.png | Bin 0 -> 7837 bytes
textscreen/fonts/normal.h | 524 ++
textscreen/fonts/normal.png | Bin 0 -> 3783 bytes
textscreen/fonts/small.h | 140 +
textscreen/fonts/small.png | Bin 0 -> 1750 bytes
textscreen/textscreen.h | 9 +
textscreen/txt_button.c | 5 +-
textscreen/txt_button.h | 6 +-
textscreen/txt_checkbox.c | 7 +-
textscreen/txt_checkbox.h | 4 +-
textscreen/txt_conditional.c | 168 +
textscreen/txt_conditional.h | 63 +
textscreen/txt_desktop.h | 2 +-
textscreen/txt_dropdown.c | 7 +-
textscreen/txt_dropdown.h | 2 +-
textscreen/txt_fileselect.c | 76 +-
textscreen/txt_fileselect.h | 2 +-
textscreen/txt_font.h | 547 --
textscreen/txt_gui.c | 99 +-
textscreen/txt_gui.h | 2 +-
textscreen/txt_inputbox.c | 25 +-
textscreen/txt_inputbox.h | 5 +-
textscreen/txt_io.c | 44 +-
textscreen/txt_io.h | 1 +
textscreen/txt_label.c | 14 +-
textscreen/txt_label.h | 4 +-
textscreen/txt_largefont.h | 2591 -------
textscreen/txt_main.h | 43 +-
textscreen/txt_radiobutton.c | 7 +-
textscreen/txt_radiobutton.h | 5 +-
textscreen/txt_sdl.c | 725 +-
textscreen/txt_separator.c | 5 +-
textscreen/txt_separator.h | 6 +-
textscreen/txt_smallfont.h | 2876 --------
textscreen/txt_spinctrl.c | 16 +-
textscreen/txt_table.c | 31 +
textscreen/txt_table.h | 12 +
textscreen/txt_window.c | 1 +
textscreen/txt_window.h | 7 +-
textscreen/txt_window_action.c | 4 +-
textscreen/txt_window_action.h | 2 +-
309 files changed, 46837 insertions(+), 17149 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git