NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

darrenr
Fri Jul  4 22:38:25 PDT 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/home/darrenr/src/sys/netinet

Modified Files:
        fil.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h 
        ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h 
        ip_state.c ip_state.h 
Log Message:
fix conflicts from import