commit 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1
Merge: 110e1078 4c0dc104
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Jul 13 23:45:57 2009 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Mon Jul 13 23:45:57 2009 +0000

    Merge from raven-branch.

    Subversion-branch: /branches/strife-branch
    Subversion-revision: 1628

 NEWS               |   2 +
 src/i_endoom.c     |   1 +
 src/i_system.c     | 105 ++++++++++++++++++++++++++++++++++++++++++-----------
 src/w_file_win32.c |   2 +
 src/z_native.c     |   5 +++
 src/z_zone.c       |   5 +++
 src/z_zone.h       |   2 +-
 7 files changed, 100 insertions(+), 22 deletions(-)