commit a28f58da05ed501efd913527067d07be85b1cc55
Merge: 7b128dc1 429fa571
Author: Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Apr 24 14:46:31 2017 +0200
Commit: Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Apr 24 14:46:31 2017 +0200
Merge branch 'master' into sdl2-branch
configure.ac | 13 ++--
data/convert-icon | 9 ++-
man/bash-completion/.gitignore | 1 +
.../{doom.template => doom.template.in} | 6 +-
.../{heretic.template => heretic.template.in} | 6 +-
.../{hexen.template => hexen.template.in} | 6 +-
.../{strife.template => strife.template.in} | 6 +-
src/d_iwad.c | 5 ++
src/doom/doomdata.h | 32 ++++-----
src/doom/p_setup.c | 4 +-
src/doom/r_data.c | 8 +--
src/doomtype.h | 10 ++-
src/heretic/d_main.c | 77 ----------------------
src/heretic/doomdata.h | 40 +++++------
src/hexen/h2_main.c | 2 +-
src/hexen/p_acs.c | 4 +-
src/hexen/xddefs.h | 40 +++++------
src/i_oplmusic.c | 12 ++--
src/midifile.c | 8 +--
src/mus2mid.c | 4 +-
src/strife/doomdata.h | 32 ++++-----
src/strife/m_saves.c | 2 +
src/strife/p_setup.c | 4 +-
src/strife/r_data.c | 8 +--
src/v_patch.h | 20 +++---
src/v_video.c | 4 +-
src/w_wad.c | 8 +--
27 files changed, 162 insertions(+), 209 deletions(-)