thorpej
Tue Jun  2 10:41:28 PDT 1998
Update of /cvsroot/src/sbin/routed
In directory nb00:/tmp/cvs-serv4693

Log Message:
Latest RIPv2/Router Discovery routed, from Vern Schryver <vjs@rhyolite.com>

Status:

Vendor Tag:	VJS
Release Tags:	routed-980602
		
U src/sbin/routed/Makefile
U src/sbin/routed/radix.h
C src/sbin/routed/defs.h
C src/sbin/routed/if.c
C src/sbin/routed/input.c
C src/sbin/routed/main.c
U src/sbin/routed/md5.c
C src/sbin/routed/output.c
C src/sbin/routed/parms.c
U src/sbin/routed/pathnames.h
U src/sbin/routed/radix.c
C src/sbin/routed/rdisc.c
C src/sbin/routed/routed.8
U src/sbin/routed/routed.h
C src/sbin/routed/table.c
C src/sbin/routed/trace.c
U src/sbin/routed/rtquery/Makefile
C src/sbin/routed/rtquery/rtquery.c
U src/sbin/routed/rtquery/rtquery.8
U src/sbin/routed/rtquery/md5.c

11 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jVJS:yesterday -jVJS src/sbin/routed