commit 59d5f4e54e320dafddb2ad38493a23f7f7fc054c
Merge: b0585fa6 3dd823ca
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Fri Dec 25 13:36:22 2015 +0100
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Fri Dec 25 13:36:22 2015 +0100

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 src/doom/am_map.c      |  8 ++++----
 src/doom/d_main.c      |  8 ++++----
 src/doom/f_finale.c    | 16 ++++++++--------
 src/doom/f_wipe.c      | 12 ++++++------
 src/doom/m_menu.c      |  4 ++--
 src/doom/p_enemy.c     |  2 +-
 src/doom/p_map.c       |  4 ++--
 src/doom/p_pspr.c      |  2 +-
 src/doom/p_setup.c     |  4 ++--
 src/doom/p_user.c      |  2 +-
 src/doom/r_draw.c      |  4 ++--
 src/doom/r_main.c      |  4 ++--
 src/doom/r_segs.c      |  4 ++--
 src/doom/r_sky.c       |  2 +-
 src/doom/r_things.c    |  4 ++--
 src/doom/st_stuff.c    |  2 +-
 src/hexen/h2def.h      | 19 +++++++++++--------
 src/i_video.c          |  2 +-
 src/m_fixed.c          |  2 +-
 src/tables.c           |  4 ++--
 src/v_video.c          |  4 ++--
 textscreen/txt_table.c |  3 ---
 22 files changed, 58 insertions(+), 58 deletions(-)