Tree [a060aa] /
History



File Date Author Commit
compat 2013-02-12 Nicholas Marriott Nicholas Marriott [0f31d2] Return error for --foo when using compat/getopt.c.
examples 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
tools 2011-07-09 Tiago Cunha Tiago Cunha [391f1f] Expand the Id keyword.
www 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
.gitignore 2013-02-09 Nicholas Marriott Nicholas Marriott [648ce2] Merge branch 'master' of ssh://git.code.sf.net/...
.mailmap 2012-11-22 Nicholas Marriott Nicholas Marriott [63f451] Merge branch 'master' of ssh://tmux.git.sourcef...
CHANGES 2012-10-13 Thomas Adam Thomas Adam [9b2aab] Merge branch 'master' of ssh://tmux.git.sourcef...
FAQ 2013-02-22 Nicholas Marriott Nicholas Marriott [ce7bf1] Merge branch 'master' of ssh://git.code.sf.net/...
Makefile.am 2013-03-06 Nicholas Marriott Nicholas Marriott [7fd4d4] Add a wait-for command which blocks a client on...
README 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
SYNCING 2013-02-20 Nicholas Marriott Nicholas Marriott [e68b9a] Merge branch 'master' of ssh://git.code.sf.net/...
TODO 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
arguments.c 2012-07-11 Tiago Cunha Tiago Cunha [a432fc] Sync OpenBSD patchset 1150:
array.h 2012-07-11 Tiago Cunha Tiago Cunha [a432fc] Sync OpenBSD patchset 1150:
attributes.c 2012-03-18 Tiago Cunha Tiago Cunha [ba7278] Sync OpenBSD patchset 1067:
autogen.sh 2013-01-31 Thomas Adam Thomas Adam [fe0060] Only set AUTO{MAKE,CONF}_VERSION on OpenBSD
cfg.c 2013-03-05 Nicholas Marriott Nicholas Marriott [f8c86a] Add some additional debug logging.
client.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
clock.c 2011-07-09 Tiago Cunha Tiago Cunha [391f1f] Expand the Id keyword.
cmd-attach-session.c 2013-02-24 Nicholas Marriott Nicholas Marriott [f339cf] Add -A flag to new-session to make it behave li...
cmd-bind-key.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-break-pane.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-capture-pane.c 2013-03-04 Nicholas Marriott Nicholas Marriott [aaeee3] Preserve trailing spaces with capture-pane -J, ...
cmd-choose-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-choose-client.c 2013-03-04 Nicholas Marriott Nicholas Marriott [43d904] tty.path can be NULL, don't dereference it. Fro...
cmd-choose-list.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-choose-tree.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-clear-history.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-clock-mode.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-command-prompt.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-confirm-before.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-copy-mode.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-delete-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-detach-client.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-display-message.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-display-panes.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-find-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-has-session.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-if-shell.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-join-pane.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-kill-pane.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-kill-server.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-kill-session.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-kill-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-link-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-buffers.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-clients.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-commands.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-keys.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-panes.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-sessions.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list-windows.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-list.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-load-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-lock-server.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-move-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-new-session.c 2013-02-24 Nicholas Marriott Nicholas Marriott [f339cf] Add -A flag to new-session to make it behave li...
cmd-new-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-paste-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-pipe-pane.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-queue.c 2013-03-05 Nicholas Marriott Nicholas Marriott [f8c86a] Add some additional debug logging.
cmd-refresh-client.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-rename-session.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-rename-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-resize-pane.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-respawn-pane.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-respawn-window.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-rotate-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-run-shell.c 2013-02-25 Thomas Adam Thomas Adam [a2f52d] Remove previous
cmd-save-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-select-layout.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-select-pane.c 2013-03-05 Nicholas Marriott Nicholas Marriott [6405fc] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-select-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-send-keys.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-server-info.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-set-buffer.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-set-environment.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-set-option.c 2013-02-23 Nicholas Marriott Nicholas Marriott [be1347] Add a -o option to set-option to prevent settin...
cmd-show-environment.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-show-messages.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-show-options.c 2013-03-04 Nicholas Marriott Nicholas Marriott [1cb1fb] Add -q flags to shut up errors to capture-pane ...
cmd-source-file.c 2013-03-05 Nicholas Marriott Nicholas Marriott [2c9cdd] Continue the parent cmdq after sourcing a file.
cmd-split-window.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-start-server.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-string.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-suspend-client.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-swap-pane.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
cmd-swap-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-switch-client.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-unbind-key.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-unlink-window.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
cmd-wait-for.c 2013-03-06 Nicholas Marriott Nicholas Marriott [bc3580] Add wait-for -L and -U for lock and unlock, fro...
cmd.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
colour.c 2012-01-21 Tiago Cunha Tiago Cunha [d4c2a9] Sync OpenBSD patchset 1006:
compat.h 2011-07-22 Nicholas Marriott Nicholas Marriott [5339b8] Typo.
configure.ac 2013-03-06 Nicholas Marriott Nicholas Marriott [e964ff] Fix --disable-static, reported by Shea Levy.
control-notify.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
control.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
environ.c 2012-07-11 Tiago Cunha Tiago Cunha [a432fc] Sync OpenBSD patchset 1150:
format.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
grid-cell.c 2013-01-30 Thomas Adam Thomas Adam [a3f4eb] Merge branch 'obsd-master'
grid-view.c 2013-03-04 Nicholas Marriott Nicholas Marriott [aaeee3] Preserve trailing spaces with capture-pane -J, ...
grid.c 2013-03-06 Nicholas Marriott Nicholas Marriott [ec75f9] Allow lastgc to be NULL in grid_string_cells so...
input-keys.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
input.c 2013-02-22 Nicholas Marriott Nicholas Marriott [7d3c10] Merge branch 'master' of ssh://git.code.sf.net/...
job.c 2013-02-17 Nicholas Marriott Nicholas Marriott [9d165d] No more lint means no more ARGSUSED.
key-bindings.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
key-string.c 2013-02-17 Nicholas Marriott Nicholas Marriott [8df3ec] In terminals with XT, turn on modifyOtherKeys=1...
layout-custom.c 2013-03-10 Nicholas Marriott Nicholas Marriott [a060aa] Fix handling of short (< 4 character) checksums...
layout-set.c 2011-11-10 Tiago Cunha Tiago Cunha [c3794d] Sync OpenBSD patchset 978:
layout.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
log.c 2012-05-30 Nicholas Marriott Nicholas Marriott [eed7d9] Do not use stderr for log file and don't call l...
mode-key.c 2013-02-19 Nicholas Marriott Nicholas Marriott [c3859d] Add copy-pipe mode command to copy selection an...
names.c 2013-02-22 Nicholas Marriott Nicholas Marriott [ce7bf1] Merge branch 'master' of ssh://git.code.sf.net/...
notify.c 2012-09-25 Thomas Adam Thomas Adam [487500] Merge branch 'obsd-master'
options-table.c 2013-02-22 Nicholas Marriott Nicholas Marriott [ce7bf1] Merge branch 'master' of ssh://git.code.sf.net/...
options.c 2012-07-11 Tiago Cunha Tiago Cunha [a432fc] Sync OpenBSD patchset 1150:
osdep-aix.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-darwin.c 2013-02-12 Nicholas Marriott Nicholas Marriott [7360ff] Use proc_pidinfo on Darwin for process name too...
osdep-dragonfly.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-freebsd.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-hpux.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-linux.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-netbsd.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-openbsd.c 2012-12-31 Thomas Adam Thomas Adam [675c6b] Merge branch 'obsd-master'
osdep-sunos.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
osdep-unknown.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5d60bc] Use pgrp of pty fd not pid of immediate child w...
paste.c 2012-11-27 Thomas Adam Thomas Adam [739a76] Merge branch 'obsd-master'
resize.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
screen-redraw.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
screen-write.c 2013-02-18 Nicholas Marriott Nicholas Marriott [e2b26d] Unbreak line wrapping.
screen.c 2013-02-10 Nicholas Marriott Nicholas Marriott [99cc00] Rework reflow code so it does not do so much al...
server-client.c 2013-03-04 Nicholas Marriott Nicholas Marriott [208881] Send DSC 1000p at the beginning of a -CC client...
server-fn.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
server-window.c 2013-02-17 Nicholas Marriott Nicholas Marriott [3d9fd1] Add various checks to turn off bits that can't ...
server.c 2013-02-23 Nicholas Marriott Nicholas Marriott [69a8d6] Merge branch 'master' of ssh://git.code.sf.net/...
session.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
signal.c 2011-07-09 Tiago Cunha Tiago Cunha [391f1f] Expand the Id keyword.
status.c 2013-02-20 Nicholas Marriott Nicholas Marriott [c577b4] Merge branch 'master' of ssh://git.code.sf.net/...
tmux.1 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
tmux.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
tmux.h 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
tty-acs.c 2011-07-09 Tiago Cunha Tiago Cunha [391f1f] Expand the Id keyword.
tty-keys.c 2013-02-23 Nicholas Marriott Nicholas Marriott [ee0f8a] Handle focus events from the terminal, from Aar...
tty-term.c 2013-01-17 Thomas Adam Thomas Adam [de1940] Merge branch 'obsd-master'
tty.c 2013-02-23 Nicholas Marriott Nicholas Marriott [ee0f8a] Handle focus events from the terminal, from Aar...
utf8.c 2012-09-24 Nicholas Marriott Nicholas Marriott [5b85ef] Fix some UTF-8 Japanese issue on OS X, SF bug 3...
window-choose.c 2013-03-09 Nicholas Marriott Nicholas Marriott [2ac650] Merge branch 'master' of ssh://git.code.sf.net/...
window-clock.c 2013-02-17 Nicholas Marriott Nicholas Marriott [9d165d] No more lint means no more ARGSUSED.
window-copy.c 2013-02-19 Nicholas Marriott Nicholas Marriott [c3859d] Add copy-pipe mode command to copy selection an...
window.c 2013-02-24 Nicholas Marriott Nicholas Marriott [c5239c] Add resize-pane -Z to temporary zoom the active...
xmalloc.c 2012-07-11 Tiago Cunha Tiago Cunha [a432fc] Sync OpenBSD patchset 1150:
xterm-keys.c 2013-02-17 Nicholas Marriott Nicholas Marriott [8df3ec] In terminals with XT, turn on modifyOtherKeys=1...

Read Me

Welcome to tmux!

tmux is a "terminal multiplexer", it enables a number of terminals (or windows)
to be accessed and controlled from a single terminal. tmux is intended to be a
simple, modern, BSD-licensed alternative to programs such as GNU screen.

This release runs on OpenBSD, FreeBSD, NetBSD, Linux and OS X and may still
run on Solaris and AIX (although they haven't been tested in a while).

Since the 1.2 release tmux depends on libevent. Download it from:

	http://www.monkey.org/~provos/libevent/

To build tmux from a release tarball, do:

	$ ./configure && make
	$ sudo make install

To get and build the latest from version control:

	$ git clone git://git.code.sf.net/p/tmux/tmux-code tmux
	$ cd tmux
	$ sh autogen.sh
	$ ./configure && make

For more information see https://sourceforge.net/scm/?type=git&group_id=200378
and http://git-scm.com. Patches should be sent by email to the mailing list at
tmux-users@lists.sourceforge.net.

For documentation on using tmux, see the tmux.1 manpage. It can be viewed from
the source tree with:

	$ nroff -mdoc tmux.1|less

Some common questions are answered in the FAQ file and a more extensive (but
slightly out of date) guide is available in the OpenBSD FAQ at
http://www.openbsd.org/faq/faq7.html#tmux. A rough todo list is in the TODO
file and some example configurations and a Vim syntax file are in the examples
directory.

For debugging, running tmux with -v or -vv will generate server and client log
files in the current directory.

tmux mailing lists are available. Visit:

	https://sourceforge.net/mail/?group_id=200378

Bug reports, feature suggestions and especially code contributions are most
welcome. Please send by email to:

	tmux-users@lists.sourceforge.net

This file and the CHANGES, FAQ and TODO files are licensed under the ISC
license. Files under examples/ remain copyright their authors unless otherwise
stated in the file but permission has been received to distribute them with
tmux. All other files have a license and copyright notice at their start.

-- Nicholas Marriott <nicm@users.sf.net>

$Id$