Merge branch 'maint'
commitaa751960178af04673f88adca4988f94ffd7f2dc
authorShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (11 19:06 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (11 19:06 -0400)
tree614f2f7f8a688c9d838997e26edf0e0a7b3d1382
parent32af629ab57869f96f282e7f7839e84d1b8e22ca
parent615b865358f32537bd4a7065a042de435e9413f3
Merge branch 'maint'

* maint:
  git-gui: Include 'war on whitespace' fixes from git.git
GIT-VERSION-GEN