commit d64626ff417323e05a479caeee02168c1eafd798
Merge: cfd1a3f8 71d316af
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Oct 22 18:33:37 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Oct 22 18:33:37 2011 +0000

    Merge from trunk.

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

 NEWS                |  4 ++++
 NOT-BUGS            | 24 ++++++++++++++++++++++++
 src/doom/d_main.c   |  8 +++++---
 src/doom/p_telept.c | 17 ++++++++---------
 src/i_video.c       | 11 +++++++----
 5 files changed, 48 insertions(+), 16 deletions(-)