cvs commit: src/sys/contrib/pf/net - Imported sources

[Max Laier]

mlaier      2004-07-17 17:06:59 UTC

  FreeBSD src repository

  src/sys/contrib/pf/net - Imported sources
  Update of /home/ncvs/src/sys/contrib/pf/net
  In directory repoman.freebsd.org:/tmp/cvs-serv51968
  
  Log Message:
  Import from OpenBSD stable branch
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_5_002
  		
  U src/sys/contrib/pf/net/if_pflog.c
  U src/sys/contrib/pf/net/if_pflog.h
  U src/sys/contrib/pf/net/if_pfsync.c
  U src/sys/contrib/pf/net/if_pfsync.h
  C src/sys/contrib/pf/net/pf.c
  U src/sys/contrib/pf/net/pf_if.c
  U src/sys/contrib/pf/net/pf_ioctl.c
  U src/sys/contrib/pf/net/pf_norm.c
  U src/sys/contrib/pf/net/pf_osfp.c
  U src/sys/contrib/pf/net/pf_table.c
  U src/sys/contrib/pf/net/pfvar.h
  
  1 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf/net