Merge master changes into rc.
authorJunio C Hamano <junkio@cox.net>
Mon, 15 Aug 2005 22:53:37 +0000 (15:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 15 Aug 2005 22:53:37 +0000 (15:53 -0700)
1  2 
Makefile
diff --cc Makefile
Simple merge