darrenr
Mon May 26 08:14:32 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/home/darrenr/new

Log Message:
New version required for 3.2alpha7

Status:

Vendor Tag:	DARRENR
Release Tags:	v3-2-a7
		
C src/usr.sbin/ipf/ipfilter2netbsd

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

	cvs checkout -jDARRENR:yesterday -jDARRENR src/usr.sbin/ipf


darrenr
Mon May 26 08:16:40 PDT 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/home/darrenr/new/src/usr.sbin/ipf

Modified Files:
	ipfilter2netbsd 
Log Message:
fix rcsid conflicts


darrenr
Mon May 26 08:18:16 PDT 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/home/darrenr/new

Log Message:
Import new sources for 3.2alpha7
(blah, someone want to clean away /cvsroot/sys/netinet ?)

Status:

Vendor Tag:	DARRENR
Release Tags:	v3-2-a7
		
N src/sys/netinet/ip_proxy.h
N src/sys/netinet/ip_proxy.c
N src/sys/netinet/ip_ftp_pxy.c

No conflicts created by this import


mrg
Mon May 26 08:18:27 PDT 1997
Update of /cvsroot/src/sbin/dump
In directory netbsd1:/var/slash-tmp/cvs-serv9523

Modified Files:
	dumprmt.c 
Log Message:
use orcmd() for now.

mrg
Mon May 26 08:18:54 PDT 1997
Update of /cvsroot/src/bin/rcp
In directory netbsd1:/var/slash-tmp/cvs-serv9546

Modified Files:
	rcp.c 
Log Message:
use orcmd() for now.