Files
git/Makefile
Johannes Schindelin dc8b641f1a Merge commit 'j6t/master' into devel
Conflicts:
	Makefile
	compat/mingw.c
	compat/win32mmap.c
	t/t1301-shared-repo.sh
	t/t4020-diff-external.sh
	t/t4129-apply-samemode.sh
	t/t7005-editor.sh
	t/test-lib.sh

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2009-04-07 17:39:50 +02:00

47 KiB