foxygit / doom Log in 
commit 28b514bb0e54250e69585b544a6c78a556f6ba0f
Merge: eef7a4e0 14e9e565
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Tue Feb 20 15:10:41 2018 -0800
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Tue Feb 20 15:10:41 2018 -0800

    Merge branch 'printf' of gh:turol/chocolate-doom

 src/deh_io.h            |  4 ++--
 src/deh_str.h           | 10 ++++++----
 src/doom/r_plane.c      |  6 +++---
 src/doomtype.h          |  5 +++++
 src/heretic/r_plane.c   |  7 ++++---
 src/hexen/r_plane.c     |  7 ++++---
 src/hexen/st_start.h    |  6 ++++--
 src/i_system.c          |  2 +-
 src/i_system.h          |  2 +-
 src/m_misc.c            |  2 +-
 src/m_misc.h            |  2 +-
 src/net_query.c         |  1 +
 src/setup/execute.h     |  3 ++-
 src/setup/multiplayer.c |  7 ++++---
 src/strife/r_plane.c    |  6 +++---
 textscreen/txt_main.h   | 13 ++++++++++++-
 16 files changed, 54 insertions(+), 29 deletions(-)