From owner-cvs-all@FreeBSD.ORG  Mon Apr 16 15:42:02 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 83A6816A402;
	Mon, 16 Apr 2007 15:42:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AD5313C46A;
	Mon, 16 Apr 2007 15:42:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3GFfvcB007976;
	Mon, 16 Apr 2007 15:41:57 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3GFfv9k007975;
	Mon, 16 Apr 2007 15:41:57 GMT (envelope-from rwatson)
Message-Id: <200704161541.l3GFfv9k007975@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 16 Apr 2007 15:41:57 +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_event
 src/contrib/openbsm/test/reference
 process32ex_record process32ex_token
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 15:42:02 -0000

rwatson     2007-04-16 15:41:56 UTC

  FreeBSD src repository

  Modified files:
    contrib/openbsm/etc  audit_event 
  Removed files:
    contrib/openbsm/test/reference process32ex_record 
                                   process32ex_token 
  Log:
  Resolve conflicts from OpenBSM 1.0 alpha 14 import.
  
  Revision  Changes    Path
  1.7       +23 -1     src/contrib/openbsm/etc/audit_event
  1.2       +0 -2      src/contrib/openbsm/test/reference/process32ex_record (dead)
  1.2       +0 -1      src/contrib/openbsm/test/reference/process32ex_token (dead)