Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 8 Feb 2010 15:57:37 +0000 (07:57 -0800)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 8 Feb 2010 15:57:37 +0000 (07:57 -0800)
* maint:
git-gui: check whether systems nice command works or disable it

1  2 
git-gui.sh
diff --cc git-gui.sh
Simple merge