foxygit / doom Log in 
commit dd283bcfdcb1eee83e76228d5818d1ad031adf17
Merge: 774256d6 2aa165bd
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Fri Jun 1 15:46:15 2018 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Fri Jun 1 15:46:15 2018 -0700

    Merge remote-tracking branch 'turol/const'

 src/d_iwad.c            | 14 +++++++-------
 src/d_iwad.h            |  2 +-
 src/d_loop.c            |  4 ++--
 src/d_loop.h            |  4 ++--
 src/i_sound.h           |  2 +-
 src/i_video.c           |  4 ++--
 src/i_video.h           |  2 +-
 src/m_config.c          | 40 ++++++++++++++++++++--------------------
 src/m_config.h          | 20 ++++++++++----------
 src/setup/multiplayer.c |  2 +-
 10 files changed, 47 insertions(+), 47 deletions(-)