Merge branch 'jc/waitpid'
commitb879de1812f390e20f5ac7eb3aad9f83db02fae1
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 09:19:08 +0000 (22 02:19 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Jun 2006 09:19:08 +0000 (22 02:19 -0700)
treebd33cfe69cf73133ea7a972976bf9f62e5b9a6b4
parente94528a0e99ea54520b8aff016275a7622c55a47
parentf0b7367cb124a628b80697f5ed095c5859022e21
Merge branch 'jc/waitpid'

* jc/waitpid:
  Restore SIGCHLD to SIG_DFL where we care about waitpid().
daemon.c