commit 46ad00deca23f3c57fcaed47af67f9003d6a4048
Merge: 9eb11191 bd20fc62
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu May 21 19:33:16 2009 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu May 21 19:33:16 2009 +0000

    Merge from trunk.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 1528

 man/manpage.template  |   4 +-
 pcsound/pcsound_sdl.c |  31 ++++++++++++-
 src/doom/p_enemy.c    | 122 +++++++++++++++++++++++---------------------------
 src/setup/display.c   |   3 +-
 4 files changed, 88 insertions(+), 72 deletions(-)