From owner-cvs-all@FreeBSD.ORG Sun Aug 22 16:53:40 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A4F916A4CE; Sun, 22 Aug 2004 16:53:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2274C43D1D; Sun, 22 Aug 2004 16:53:40 +0000 (GMT) (envelope-from mlaier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7MGre4f035934; Sun, 22 Aug 2004 16:53:40 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7MGrenh035933; Sun, 22 Aug 2004 16:53:40 GMT (envelope-from mlaier) Message-Id: <200408221653.i7MGrenh035933@repoman.freebsd.org> From: Max Laier Date: Sun, 22 Aug 2004 16:53:40 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: OPENBSD Subject: cvs commit: src/contrib/pf/pfctl - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Aug 2004 16:53:40 -0000 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