NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

christos
Mon Feb  3 16:06:52 EST 1997
Update of /a/cvsroot/src/sbin/routed
In directory netbsd1:/var/slash-tmp/cvs-serv19540

Log Message:
New version from ftp.sgi.com:sgi/src/routed.tar.Z

Status:

Vendor Tag:     SGI
Release Tags:   routed-970113
                
C 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
N 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
C src/sbin/routed/routed.h
C src/sbin/routed/table.c
C src/sbin/routed/trace.c
C src/sbin/routed/rtquery/Makefile
C src/sbin/routed/rtquery/rtquery.c
C src/sbin/routed/rtquery/rtquery.8
N src/sbin/routed/rtquery/md5.c

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

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


oki
Mon Feb  3 13:08:49 PST 1997
Update of /cvsroot/src/sys/arch/x68k/x68k
In directory netbsd1:/var/slash-tmp/cvs-serv20116

Modified Files:
        autoconf.c 
Log Message:
Remove initialize mrh_list line, and fixed