cvs commit: src/contrib/pf/pfctl - Imported sources

[Max Laier]

mlaier      2004-08-22 16:53:39 UTC

  FreeBSD src repository

  src/contrib/pf/pfctl - Imported sources
  Update of /home/ncvs/src/contrib/pf/pfctl
  In directory repoman.freebsd.org:/tmp/cvs-serv35884
  
  Log Message:
  Import pfctl_table.c#1.61 from OpenBSD into vendor branch.
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_5_001
  		
  U src/contrib/pf/pfctl/parse.y
  U src/contrib/pf/pfctl/pf_print_state.c
  U src/contrib/pf/pfctl/pfctl.8
  U src/contrib/pf/pfctl/pfctl.c
  U src/contrib/pf/pfctl/pfctl.h
  U src/contrib/pf/pfctl/pfctl_altq.c
  U src/contrib/pf/pfctl/pfctl_osfp.c
  U src/contrib/pf/pfctl/pfctl_parser.c
  U src/contrib/pf/pfctl/pfctl_parser.h
  U src/contrib/pf/pfctl/pfctl_qstats.c
  U src/contrib/pf/pfctl/pfctl_radix.c
  C src/contrib/pf/pfctl/pfctl_table.c
  
  1 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/contrib/pf/pfctl