Steffen Prohaska 64934ca81e Merge commit 'mingw/master' into devel ...

Conflicts:

	Makefile
	git-compat-util.h
	help.c
	t/t5505-remote.sh

2008-03-16 22:26:33 +01:00

..

po

Merge git://git.kernel.org/pub/scm/gitk/gitk

2008-03-14 17:49:40 -07:00

gitk

Merge commit 'mingw/master' into devel

2008-03-16 22:26:33 +01:00

Makefile

Merge branch 'master' of git://repo.or.cz/alt-git

2008-03-16 20:31:03 +01:00