Conflicts:
	src/d_clisrv.c
	src/d_clisrv.h
	src/d_main.c
	src/d_net.c
	src/d_net.h
	src/d_netcmd.c
	src/doomdef.h
	src/i_net.h
	src/i_tcp.c
	src/i_tcp.h
	src/mserv.c
	src/mserv.h
	src/p_inter.c
	src/st_stuff.c

Holy cow!