Merge branch 'master' into socket
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 17 Oct 2008 23:11:09 +0000 (01:11 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 17 Oct 2008 23:11:09 +0000 (01:11 +0200)
commit51da262d8d796aa8a31ee1513783735a40130931
tree73a747e06c0f7787c503d689296fb116019e6cce
parent2e123451c0399c4707c8f40d0d8d6d372b6f9960
parent3c7f2d14ba774a61baea64c9180b8d70cbe3e020
Merge branch 'master' into socket

Conflicts:

daemon/net.c
daemon/fnet-dc.c
daemon/net.c
daemon/ui.c