Merge refs/heads/master from .
authorJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 02:09:48 +0000 (19:09 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 30 Aug 2005 02:09:48 +0000 (19:09 -0700)
1  2 
Makefile
diff --cc Makefile
Simple merge