commit 5ff1698982eb861a55031de14654a195a6895006
Merge: ded7e89d f3ce0c7f
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sat Mar 17 23:49:03 2018 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sat Mar 17 23:49:03 2018 -0400
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
man/Makefile.am | 14 ++++++++++----
pkg/win32/GNUmakefile | 6 +-----
src/deh_str.c | 16 ++++++++--------
src/deh_str.h | 2 +-
src/doom/hu_lib.c | 4 ++--
src/doom/hu_lib.h | 4 ++--
src/i_sdlmusic.c | 39 +++++++++++++++++++++++----------------
src/i_system.c | 6 +++---
src/i_system.h | 6 +++---
src/m_misc.c | 23 ++++++++++++-----------
src/m_misc.h | 16 ++++++++--------
src/w_wad.c | 8 ++++----
src/w_wad.h | 8 ++++----
src/z_native.c | 2 +-
src/z_zone.c | 2 +-
src/z_zone.h | 2 +-
textscreen/txt_button.c | 6 +++---
textscreen/txt_button.h | 6 +++---
textscreen/txt_checkbox.c | 4 ++--
textscreen/txt_checkbox.h | 4 ++--
textscreen/txt_desktop.c | 2 +-
textscreen/txt_desktop.h | 2 +-
textscreen/txt_fileselect.c | 6 +++---
textscreen/txt_fileselect.h | 2 +-
textscreen/txt_label.c | 6 +++---
textscreen/txt_label.h | 4 ++--
textscreen/txt_main.h | 2 +-
textscreen/txt_radiobutton.c | 4 ++--
textscreen/txt_radiobutton.h | 4 ++--
textscreen/txt_sdl.c | 10 +++++-----
textscreen/txt_separator.c | 4 ++--
textscreen/txt_separator.h | 4 ++--
textscreen/txt_window.c | 10 +++++-----
textscreen/txt_window.h | 8 ++++----
34 files changed, 128 insertions(+), 118 deletions(-)