source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 07/12/1998 08:30:01

veego
Sun Jul 12 08:24:00 PDT 1998
Update of /cvsroot/src/sys/netinet
In directory nb00:/tmp/cvs-serv20981

Modified Files:
	fil.c ip_auth.c ip_compat.h ip_fil.h ip_frag.c ip_log.c 
	ip_nat.c ip_proxy.c ip_state.c 
Log Message:
Resolve conflicts from the import.


veego
Sun Jul 12 08:27:46 PDT 1998
Update of /cvsroot/src/sys/netinet
In directory nb00:/tmp/cvs-serv21042

Modified Files:
	ip_ftp_pxy.c 
Log Message:
Resolve conflicts from the import.