commit a42a4824fa7e4d883a2f710c91655b2edb02f525
Merge: 993315af f5e5190c
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Fri Dec 14 01:18:38 2012 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Fri Dec 14 01:18:38 2012 +0000

    Merge from trunk.

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

 NOT-BUGS                   |   16 +
 src/d_iwad.c               |   38 +-
 src/i_video.c              |   10 +-
 textscreen/Makefile.am     |    1 +
 textscreen/txt_font.h      |    2 +-
 textscreen/txt_largefont.h | 2599 ++++++++++++++++++++++++++++++++++++++++++++
 textscreen/txt_sdl.c       |   55 +-
 7 files changed, 2681 insertions(+), 40 deletions(-)