From owner-p4-projects@FreeBSD.ORG  Mon Apr 18 11:46:44 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 633FD16A4D0; Mon, 18 Apr 2005 11:46:44 +0000 (GMT)
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 0D43316A4CF
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:46:44 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D71F743D3F
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:46:43 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3IBkhqm085450
	for <perforce@freebsd.org>; Mon, 18 Apr 2005 11:46:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3IBkhiv085447
	for perforce@freebsd.org; Mon, 18 Apr 2005 11:46:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Apr 2005 11:46:43 GMT
Message-Id: <200504181146.j3IBkhiv085447@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 75475 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 18 Apr 2005 11:46:45 -0000

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

Change 75475 by rwatson@rwatson_paprika on 2005/04/18 11:46:11

	Merge $FreeBSD$ from CVS to reduce diff size.  Will conflict next
	integ, of course.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#4 edit
.. //depot/projects/trustedbsd/mac/sys/modules/mac_lomac/Makefile#3 edit
.. //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#3 edit
.. //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_bsdextended/Makefile,v 1.1 2002/08/01 17:41:26 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_bsdextended
 

==== //depot/projects/trustedbsd/mac/sys/modules/mac_lomac/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_lomac/Makefile,v 1.1 2002/11/26 17:35:44 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_lomac
 

==== //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_partition/Makefile,v 1.1 2002/10/24 02:04:03 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_partition
 

==== //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/mac_seeotheruids/Makefile,v 1.1 2002/08/01 17:41:27 rwatson Exp $
 
 .PATH: ${.CURDIR}/../../security/mac_seeotheruids