Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:19:47 +0000 (23:19 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:19:47 +0000 (23:19 -0700)
1  2 
daemon.c

diff --cc daemon.c
Simple merge