From owner-cvs-src@FreeBSD.ORG  Thu Sep 21 07:12:34 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 991D016A416;
	Thu, 21 Sep 2006 07:12:34 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E63443D68;
	Thu, 21 Sep 2006 07:12:34 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8L7CYTR048145;
	Thu, 21 Sep 2006 07:12:34 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8L7CYXK048144;
	Thu, 21 Sep 2006 07:12:34 GMT (envelope-from rwatson)
Message-Id: <200609210712.k8L7CYXK048144@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 21 Sep 2006 07:12:34 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/openbsm/etc audit_control audit_event
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Sep 2006 07:12:34 -0000

rwatson     2006-09-21 07:12:34 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_control audit_event 
  Log:
  Resolve conflicts from OpenBSM 1.0 alpha 11 vendor import: we have locally
  added $FreeBSD$ to /etc configuration files to assist mergemaster.
  
  Revision  Changes    Path
  1.3       +2 -1      src/contrib/openbsm/etc/audit_control
  1.5       +10 -7     src/contrib/openbsm/etc/audit_event