Subject: CVS commit: syssrc
To: None <>
From: Bernd Ernesti <>
List: source-changes
Date: 12/12/1999 03:11:20
Module Name:	syssrc
Committed By:	veego
Date:		Sun Dec 12 11:11:19 UTC 1999

Modified Files:
	syssrc/sys/netinet: fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c
	    ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_log.c ip_nat.c
	    ip_nat.h ip_proxy.c ip_proxy.h ip_state.c ip_state.h

Log Message:
Resolve conflicts and small fixes.

To generate a diff of this commit:
cvs rdiff -r1.27 -r1.28 syssrc/sys/netinet/fil.c
cvs rdiff -r1.11 -r1.12 syssrc/sys/netinet/ip_auth.c \
cvs rdiff -r1.4 -r1.5 syssrc/sys/netinet/ip_auth.h
cvs rdiff -r1.16 -r1.17 syssrc/sys/netinet/ip_compat.h
cvs rdiff -r1.37 -r1.38 syssrc/sys/netinet/ip_fil.c
cvs rdiff -r1.31 -r1.32 syssrc/sys/netinet/ip_fil.h
cvs rdiff -r1.14 -r1.15 syssrc/sys/netinet/ip_frag.c
cvs rdiff -r1.12 -r1.13 syssrc/sys/netinet/ip_frag.h \
cvs rdiff -r1.7 -r1.8 syssrc/sys/netinet/ip_log.c
cvs rdiff -r1.25 -r1.26 syssrc/sys/netinet/ip_nat.c
cvs rdiff -r1.15 -r1.16 syssrc/sys/netinet/ip_nat.h
cvs rdiff -r1.18 -r1.19 syssrc/sys/netinet/ip_proxy.c
cvs rdiff -r1.17 -r1.18 syssrc/sys/netinet/ip_state.c
cvs rdiff -r1.13 -r1.14 syssrc/sys/netinet/ip_state.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.