commit 67fbcdce28b89b24f8fb27d5f25393ad775af719
Merge: 08bc270b 39b7cb7b
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Feb 8 17:52:08 2009 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Feb 8 17:52:08 2009 +0000

    Merge from trunk.

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

 textscreen/Makefile.am        |   1 +
 textscreen/examples/guitest.c |  54 +++++-
 textscreen/textscreen.h       |   1 +
 textscreen/txt_gui.c          | 103 +++++++++-
 textscreen/txt_gui.h          |   3 +
 textscreen/txt_scrollpane.c   | 442 ++++++++++++++++++++++++++++++++++++++++++
 textscreen/txt_scrollpane.h   |  42 ++++
 textscreen/txt_table.c        |  26 +++
 textscreen/txt_table.h        |   3 +
 9 files changed, 670 insertions(+), 5 deletions(-)