darrenr
Fri Mar 28 18:50:05 PST 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/home/darrenr/32a2/ipfilter/src/usr.sbin/ipf

Log Message:
Properly import usr.sbin/ipf updates

Status:

Vendor Tag:	DARRENR
Release Tags:	V3_2ALPHA2
		
U src/usr.sbin/ipf/ipfstat/kmem.c
U src/usr.sbin/ipf/ipfstat/kmem.h
C src/usr.sbin/ipf/ipfstat/fils.c
U src/usr.sbin/ipf/ipfstat/ipfstat.8
U src/usr.sbin/ipf/ipfstat/Makefile
C src/usr.sbin/ipf/ipmon/ipmon.c
U src/usr.sbin/ipf/ipmon/ipmon.8
U src/usr.sbin/ipf/ipmon/Makefile
U src/usr.sbin/ipf/ipftest/ipt.c
U src/usr.sbin/ipf/ipftest/ipft_sn.c
U src/usr.sbin/ipf/ipftest/ipft_ef.c
U src/usr.sbin/ipf/ipftest/ipft_td.c
U src/usr.sbin/ipf/ipftest/ipft_pc.c
N src/usr.sbin/ipf/ipftest/opt.c
U src/usr.sbin/ipf/ipftest/ipft_tx.c
U src/usr.sbin/ipf/ipftest/misc.c
N src/usr.sbin/ipf/ipftest/ip_frag.c
N src/usr.sbin/ipf/ipftest/ip_state.c
N src/usr.sbin/ipf/ipftest/ip_nat.c
U src/usr.sbin/ipf/ipftest/ipft_hx.c
U src/usr.sbin/ipf/ipftest/ipt.h
U src/usr.sbin/ipf/ipftest/snoop.h
U src/usr.sbin/ipf/ipftest/Makefile
N src/usr.sbin/ipf/ipftest/test/.cvsignore
N src/usr.sbin/ipf/ipftest/test/Makefile
N src/usr.sbin/ipf/ipftest/test/dotest
N src/usr.sbin/ipf/ipftest/test/hextest
N src/usr.sbin/ipf/ipftest/test/itest
N src/usr.sbin/ipf/ipftest/test/test.sed
N src/usr.sbin/ipf/ipftest/test/expected/1
N src/usr.sbin/ipf/ipftest/test/expected/10
N src/usr.sbin/ipf/ipftest/test/expected/11
N src/usr.sbin/ipf/ipftest/test/expected/12
N src/usr.sbin/ipf/ipftest/test/expected/2
N src/usr.sbin/ipf/ipftest/test/expected/3
N src/usr.sbin/ipf/ipftest/test/expected/4
N src/usr.sbin/ipf/ipftest/test/expected/5
N src/usr.sbin/ipf/ipftest/test/expected/6
N src/usr.sbin/ipf/ipftest/test/expected/7
N src/usr.sbin/ipf/ipftest/test/expected/8
N src/usr.sbin/ipf/ipftest/test/expected/9
N src/usr.sbin/ipf/ipftest/test/expected/expected.sed
N src/usr.sbin/ipf/ipftest/test/expected/i1
N src/usr.sbin/ipf/ipftest/test/expected/i10
N src/usr.sbin/ipf/ipftest/test/expected/i11
N src/usr.sbin/ipf/ipftest/test/expected/i2
N src/usr.sbin/ipf/ipftest/test/expected/i3
N src/usr.sbin/ipf/ipftest/test/expected/i4
N src/usr.sbin/ipf/ipftest/test/expected/i5
N src/usr.sbin/ipf/ipftest/test/expected/i6
N src/usr.sbin/ipf/ipftest/test/expected/i7
N src/usr.sbin/ipf/ipftest/test/expected/i8
N src/usr.sbin/ipf/ipftest/test/expected/i9
N src/usr.sbin/ipf/ipftest/test/input/1
N src/usr.sbin/ipf/ipftest/test/input/10
N src/usr.sbin/ipf/ipftest/test/input/11
N src/usr.sbin/ipf/ipftest/test/input/12
N src/usr.sbin/ipf/ipftest/test/input/13
N src/usr.sbin/ipf/ipftest/test/input/2
N src/usr.sbin/ipf/ipftest/test/input/3
N src/usr.sbin/ipf/ipftest/test/input/4
N src/usr.sbin/ipf/ipftest/test/input/5
N src/usr.sbin/ipf/ipftest/test/input/6
N src/usr.sbin/ipf/ipftest/test/input/7
N src/usr.sbin/ipf/ipftest/test/input/8
N src/usr.sbin/ipf/ipftest/test/input/9
N src/usr.sbin/ipf/ipftest/test/input/input.sed
N src/usr.sbin/ipf/ipftest/test/regress/1
N src/usr.sbin/ipf/ipftest/test/regress/10
N src/usr.sbin/ipf/ipftest/test/regress/11
N src/usr.sbin/ipf/ipftest/test/regress/12
N src/usr.sbin/ipf/ipftest/test/regress/13
N src/usr.sbin/ipf/ipftest/test/regress/2
N src/usr.sbin/ipf/ipftest/test/regress/3
N src/usr.sbin/ipf/ipftest/test/regress/4
N src/usr.sbin/ipf/ipftest/test/regress/5
N src/usr.sbin/ipf/ipftest/test/regress/6
N src/usr.sbin/ipf/ipftest/test/regress/7
N src/usr.sbin/ipf/ipftest/test/regress/8
N src/usr.sbin/ipf/ipftest/test/regress/9
N src/usr.sbin/ipf/ipftest/test/regress/i1
N src/usr.sbin/ipf/ipftest/test/regress/i10
N src/usr.sbin/ipf/ipftest/test/regress/i11
N src/usr.sbin/ipf/ipftest/test/regress/i2
N src/usr.sbin/ipf/ipftest/test/regress/i3
N src/usr.sbin/ipf/ipftest/test/regress/i4
N src/usr.sbin/ipf/ipftest/test/regress/i5
N src/usr.sbin/ipf/ipftest/test/regress/i6
N src/usr.sbin/ipf/ipftest/test/regress/i7
N src/usr.sbin/ipf/ipftest/test/regress/i8
N src/usr.sbin/ipf/ipftest/test/regress/i9
N src/usr.sbin/ipf/ipftest/test/regress/regress.sed
C src/usr.sbin/ipf/ipnat/ipnat.c
U src/usr.sbin/ipf/ipnat/ipnat.4
U src/usr.sbin/ipf/ipnat/ipnat.5
U src/usr.sbin/ipf/ipnat/ipnat.8
U src/usr.sbin/ipf/ipnat/Makefile

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

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