Merge branch 'maint'

author Shawn O. Pearce <spearce@spearce.org>

Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)

committer Shawn O. Pearce <spearce@spearce.org>

Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)
author Shawn O. Pearce <spearce@spearce.org>
Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)
committer Shawn O. Pearce <spearce@spearce.org>
Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)
diff --cc lib/browser.tcl
Simple merge
diff --cc lib/console.tcl
Simple merge
author	Shawn O. Pearce <spearce@spearce.org>
	Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)
committer	Shawn O. Pearce <spearce@spearce.org>
	Tue, 10 Jul 2007 01:19:13 +0000 (21:19 -0400)
		1	2
lib/browser.tcl	patch \|	diff1 \|	diff2 \|	blob \| history
lib/console.tcl	patch \|	diff1 \|	diff2 \|	blob \| history