]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6ade62e) | patch
Resolve conflicts from OpenBSM 1.0 alpha 11 vendor import: we have locally
authorrwatson <rwatson@FreeBSD.org>
Thu, 21 Sep 2006 07:12:33 +0000 (07:12 +0000)
committerrwatson <rwatson@FreeBSD.org>
Thu, 21 Sep 2006 07:12:33 +0000 (07:12 +0000)
commit24e652fd73a7bad78eb9bdc1ebbdc288816b0dcd
tree61eae816c9d6a043a50a565c94b5116779a202f9tree | snapshot
parent6ade62ef2afbea80c3328785843dad2f6eccb547commit | diff
Resolve conflicts from OpenBSM 1.0 alpha 11 vendor import: we have locally
added $FreeBSD$ to /etc configuration files to assist mergemaster.
contrib/openbsm/etc/audit_control diff | blob | history
contrib/openbsm/etc/audit_event diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.