Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (19:17 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Oct 2005 02:17:43 +0000 (19:17 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge