Date: Thu, 21 Sep 2006 07:12:34 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/openbsm/etc audit_control audit_event Message-ID: <200609210712.k8L7CYXK048144@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609210712.k8L7CYXK048144>