Junio C Hamano 547905f8cd Merge git://repo.or.cz/git-gui ... * git://repo.or.cz/git-gui: git-gui: MERGE_RR lives in .git/ directly with newer Git versions git-gui: Exit shortcut in MacOSX repaired		2008-07-15 00:08:02 -07:00
..
lib	Merge git://repo.or.cz/git-gui	2008-07-15 00:08:02 -07:00
macosx	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	2008-02-23 11:23:59 -08:00
po	Merge git://repo.or.cz/git-gui	2008-05-15 01:31:15 -07:00
windows	Merge git://repo.or.cz/git-gui	2007-11-21 00:00:56 -08:00
.gitignore	Merge git://repo.or.cz/git-gui	2007-11-21 00:00:56 -08:00
GIT-VERSION-GEN	Merge git://repo.or.cz/git-gui	2008-04-02 10:29:10 -07:00
Makefile	Merge git://repo.or.cz/git-gui	2008-03-11 22:59:35 -07:00
git-gui.sh	Merge git://repo.or.cz/git-gui	2008-07-15 00:08:02 -07:00