Merge branch 't/periodic_header_optional'
authorAndre Noll <maan@systemlinux.org>
Sat, 22 Jan 2011 15:57:02 +0000 (16:57 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 22 Jan 2011 15:57:02 +0000 (16:57 +0100)
1  2 
command.c
dccp_send.c
http_send.c
send.h
server.c
udp_send.c
vss.c

diff --cc command.c
Simple merge
diff --cc dccp_send.c
Simple merge
diff --cc http_send.c
Simple merge
diff --cc send.h
Simple merge
diff --cc server.c
Simple merge
diff --cc udp_send.c
Simple merge
diff --cc vss.c
Simple merge