Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 10 Oct 2007 05:09:41 +0000 (01:09 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 10 Oct 2007 05:09:41 +0000 (01:09 -0400)
* maint:
git-gui: accept versions containing text annotations, like 1.5.3.mingw.1

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