cgd
Fri May 13 01:01:33 PDT 1994
Update of /b/source/CVS/src/sys/sys
In directory sun-lamp.cs.berkeley.edu:/e/users/cgd/trees/ren/sys/sys

Modified Files:
	malloc.h proc.h 
Log Message:
kill 3 bogons, note more to go...

mycroft
Fri May 13 01:02:22 PDT 1994
Update of /b/source/CVS/src/sbin/route
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/sbin/route

Modified Files:
	Makefile ccitt_addr.c keywords route.8 route.c 
Log Message:
Clean up import.

mycroft
Fri May 13 01:03:26 PDT 1994
Update of /b/source/CVS/src/sbin/routed
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/sbin/routed

Revision/Branch: 1.1.1

Log Message:
From 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/sbin/routed/Makefile
C src/sbin/routed/trace.h
C src/sbin/routed/trace.c
C src/sbin/routed/timer.c
C src/sbin/routed/tables.c
C src/sbin/routed/table.h
C src/sbin/routed/startup.c
C src/sbin/routed/pathnames.h
C src/sbin/routed/output.c
C src/sbin/routed/main.c
C src/sbin/routed/interface.h
C src/sbin/routed/input.c
C src/sbin/routed/inet.c
C src/sbin/routed/if.c
C src/sbin/routed/defs.h
C src/sbin/routed/af.h
C src/sbin/routed/af.c
C src/sbin/routed/routed.8
C src/sbin/routed/query/Makefile
C src/sbin/routed/query/query.c
C src/sbin/routed/trace/trace.c
C src/sbin/routed/trace/Makefile

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

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


mycroft
Fri May 13 01:05:01 PDT 1994
Update of /b/source/CVS/src/sbin/routed
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/sbin/routed

Modified Files:
	Makefile af.c af.h defs.h if.c inet.c input.c interface.h 
	main.c output.c pathnames.h routed.8 startup.c table.h 
	tables.c timer.c trace.c trace.h 
Log Message:
Clean up import.

mycroft
Fri May 13 01:05:05 PDT 1994
Update of /b/source/CVS/src/sbin/routed/query
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/sbin/routed/query

Modified Files:
	Makefile query.c 
Log Message:
Clean up import.

mycroft
Fri May 13 01:05:10 PDT 1994
Update of /b/source/CVS/src/sbin/routed/trace
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/sbin/routed/trace

Modified Files:
	Makefile trace.c 
Log Message:
Clean up import.

mycroft
Fri May 13 01:07:04 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

Revision/Branch: 1.1.1

Log Message:
From 4.4-Lite.

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
N 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

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

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


mycroft
Fri May 13 01:08:24 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 if.c inet.c iso.c main.c mbuf.c mroute.c netstat.1 
	netstat.h ns.c route.c unix.c 
Removed Files:
	host.c 
Log Message:
Clean up import.

mycroft
Fri May 13 01:08:58 PDT 1994
Update of /b/source/CVS/src/usr.sbin/arp
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.sbin/arp

Revision/Branch: 1.1.1

Log Message:
From 4.4-Lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.sbin/arp/arp.c
C src/usr.sbin/arp/arp.8
C src/usr.sbin/arp/Makefile
N src/usr.sbin/arp/arp4.4

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/arp


mycroft
Fri May 13 01:09:24 PDT 1994
Update of /b/source/CVS/src/usr.sbin/arp
In directory sun-lamp.cs.berkeley.edu:/d/users/mycroft/src/usr.sbin/arp

Modified Files:
	Makefile arp.8 arp.c arp4.4 
Log Message:
Clean up import.

------------------------------------------------------------------------------