Date: Sun, 2 May 2004 12:43:32 -0700 (PDT) From: Daniel Hartmeier <dhartmei@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/pf/net - Imported sources Message-ID: <200405021943.i42JhWuH050655@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dhartmei 2004/05/02 12:43:32 PDT 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-serv50371 Log Message: Import OpenBSD 3.4-stable fixes Status: Vendor Tag: OPENBSD Release Tags: pf_openbsd_3_4_003 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 C src/sys/contrib/pf/net/pf_ioctl.c C 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 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf/net
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405021943.i42JhWuH050655>