Merge branch 'maint'

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

Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)

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

Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)
author Shawn O. Pearce <spearce@spearce.org>
Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)
committer Shawn O. Pearce <spearce@spearce.org>
Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)
diff --cc git-gui.sh
Simple merge
diff --cc lib/browser.tcl
Simple merge
author	Shawn O. Pearce <spearce@spearce.org>
	Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)
committer	Shawn O. Pearce <spearce@spearce.org>
	Mon, 17 Sep 2007 03:15:21 +0000 (23:15 -0400)
		1	2
git-gui.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/browser.tcl	patch \|	diff1 \|	diff2 \|	blob \| history