From owner-p4-projects@FreeBSD.ORG  Tue Jul 11 21:05:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75E0816A4DD; Tue, 11 Jul 2006 21:05:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 43A7816A50A
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:05:33 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3ABE143DD4
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:03:40 +0000 (GMT)
	(envelope-from jhb@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 k6BL3FLP004197
	for <perforce@freebsd.org>; Tue, 11 Jul 2006 21:03:15 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6BL3FsV004194
	for perforce@freebsd.org; Tue, 11 Jul 2006 21:03:15 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 11 Jul 2006 21:03:15 GMT
Message-Id: <200607112103.k6BL3FsV004194@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101293 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jul 2006 21:05:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=101293

Change 101293 by jhb@jhb_mutex on 2006/07/11 21:02:46

	Attempt to fix a mismerge.

Affected files ...

.. //depot/projects/smpng/sys/bsm/audit_record.h#5 edit

Differences ...

==== //depot/projects/smpng/sys/bsm/audit_record.h#5 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#4 $
+ * $P4: //depot/projects/smpng/sys/bsm/audit_record.h#5 $
  * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $
  */