foxygit / doom Log in 
commit 100b658b470ecaf9ff5e2c3407bfff224e91fb01
Merge: ba1accec be3bba2a
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Sep 10 20:28:59 2009 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Sep 10 20:28:59 2009 +0000

    Merge from trunk.

    Subversion-branch: /branches/opl-branch
    Subversion-revision: 1662

 acinclude.m4                | 31 +++++++++++++++++
 configure.in                | 52 +++++++++++++++++-----------
 src/i_main.c                |  4 +--
 src/i_sdlsound.c            |  7 ++--
 src/i_video.c               | 65 +++++++++++++++++++----------------
 src/w_file_win32.c          |  2 ++
 textscreen/txt_gui.c        |  1 -
 textscreen/txt_scrollpane.c | 76 ++++++++++++++++++++++++++++++++++++++++-
 textscreen/txt_table.c      | 82 +++++++++++++++++++++++++++++++++++++++++++++
 textscreen/txt_table.h      | 13 +++++++
 wince/Makefile.am           |  2 +-
 wince/dummy.c               |  8 +++++
 12 files changed, 289 insertions(+), 54 deletions(-)