From 144eea387465dd3aebdc4046e8e6d172c51f17bc Mon Sep 17 00:00:00 2001
From: brueffer <brueffer@FreeBSD.org>
Date: Mon, 4 Jan 2016 16:32:21 +0000
Subject: MFH: 292432,r292433,r292434

- Merge OpenBSM 1.2 alpha 4.
- Regenerate config.h for OpenBSM 1.2 alpha 4.
- Add au_notify.2 and MLINKs (added in OpenBSM 1.2 alpha 4).

Relnotes:	yes
---
 contrib/openbsm/bin/auditdistd/pjdlog.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'contrib/openbsm/bin/auditdistd/pjdlog.h')

diff --git a/contrib/openbsm/bin/auditdistd/pjdlog.h b/contrib/openbsm/bin/auditdistd/pjdlog.h
index 0cb6121..d6f217f 100644
--- a/contrib/openbsm/bin/auditdistd/pjdlog.h
+++ b/contrib/openbsm/bin/auditdistd/pjdlog.h
@@ -26,8 +26,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/pjdlog.h#1 $
  */
 
 #ifndef	_PJDLOG_H_
-- 
cgit v1.1