Merge branch 'maint' of git://repo.or.cz/git-gui into maint
commit3ed02de2f46105cbc45fcc8f3287513f470eb4a3
authorJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 18:43:22 +0000 (12 11:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 18:43:22 +0000 (12 11:43 -0700)
tree92c64fbd9e0a927c8529e6a169e263a675fa621e
parentfc095242b16d57bad1bfe089f919b9d6e6deda1b
parent756d846fea4ac4b3bf0a0aea9fbf721138cf34cc
Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Allow 'git gui version' outside of a repository
  git-gui: Revert "git-gui: Display all authors of git-gui."
  git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
  git-gui: Allow committing empty merges
git-gui/.gitignore
git-gui/Makefile
git-gui/git-gui.sh