sun-lamp CVS commits

[The Source Master <srcmastr%NetBSD.ORG@localhost>]

mycroft
Thu Oct  6 09:30:58 PDT 1994
Update of /b/source/CVS/src/usr.bin/netstat
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.bin/netstat

Modified Files:
        Makefile iso.c 
Log Message:
Re-enable some ugly ISO code.

mycroft
Thu Oct  6 09:35:11 PDT 1994
Update of /b/source/CVS/src/usr.bin/netstat
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.bin/netstat/t

Revision/Branch: 1.1.1

Log Message:
Import original 4.4-Lite version.

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/usr.bin/netstat/Makefile
C src/usr.bin/netstat/route.c
C src/usr.bin/netstat/ns.c
C src/usr.bin/netstat/netstat.h
C src/usr.bin/netstat/netstat.1
C src/usr.bin/netstat/mroute.c
C src/usr.bin/netstat/mbuf.c
C src/usr.bin/netstat/main.c
C src/usr.bin/netstat/iso.c
C src/usr.bin/netstat/inet.c
C src/usr.bin/netstat/if.c
C src/usr.bin/netstat/unix.c

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

        cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/netstat