Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (19:06 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (19:06 -0400)
* maint:
git-gui: Include 'war on whitespace' fixes from git.git

1  2 
GIT-VERSION-GEN
diff --cc GIT-VERSION-GEN
Simple merge