Merge branch 'socket' into transsock
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 20:30:19 +0000 (21:30 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 20:30:19 +0000 (21:30 +0100)
commit96be906d7e4bf2bfa84a926e1b1b149cdd708021
tree32eac3c1fcdeddf4e6b8eb5614aae930e888d53c
parent363c7059ebeac9d54a372a26737e2235d849eae5
parent2e123451c0399c4707c8f40d0d8d6d372b6f9960
Merge branch 'socket' into transsock

Conflicts:

daemon/transfer.c
daemon/transfer.h
daemon/transfer.c