commit f1934e990d7c6d8034650fa09b8a175b542330ba
Merge: ea5b5f17 adbfa321
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Dec 24 00:03:41 2012 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Dec 24 00:03:41 2012 +0000

    Merge from trunk.

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2553

 pkg/osx/disk/dir.DS_Store  | Bin 8196 -> 28196 bytes
 src/doom/am_map.c          |   2 --
 src/doom/g_game.c          |  12 +++---------
 src/doom/hu_lib.c          |   2 --
 src/doom/m_menu.c          |   5 ++---
 src/doom/p_doors.c         |   2 --
 src/doom/p_enemy.c         |   5 +----
 src/doom/p_spec.c          |   5 -----
 src/doom/r_data.c          |  10 +++-------
 src/doom/s_sound.c         |   6 ------
 src/doom/wi_stuff.c        |   4 ----
 src/i_video.c              |   5 ++---
 textscreen/txt_largefont.h |  10 +++++-----
 13 files changed, 16 insertions(+), 52 deletions(-)