Merge branch 'maint'
commit2a9edd03057287cf7d69e5021eda2e0122684c92
authorShawn O. Pearce <spearce@spearce.org>
Mon, 8 Feb 2010 15:57:37 +0000 (8 07:57 -0800)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 8 Feb 2010 15:57:37 +0000 (8 07:57 -0800)
tree795b45f435316515153e403a2dafa4665a9526aa
parent89d61592bddda4dfcb90314be9e06479f712bb7f
parent9c898a18ea37aa04a84c3a2d18794cf892862702
Merge branch 'maint'

* maint:
  git-gui: check whether systems nice command works or disable it
git-gui.sh