From owner-p4-projects Thu Aug 8 19:53:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E5F237B401; Thu, 8 Aug 2002 19:53:38 -0700 (PDT) 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 D305C37B400 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FFD343E77 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g792rbJU075004 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g792rbOD075001 for perforce@freebsd.org; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Date: Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Message-Id: <200208090253.g792rbOD075001@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15706 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15706 Change 15706 by rwatson@rwatson_paprika on 2002/08/08 19:52:52 Synchronize $FreeBSD$ which gets silently dropped in the baseless merge. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#15 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#6 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#3 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#6 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.8 2002/06/13 23:40:13 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.9 2002/08/02 21:14:42 rwatson Exp $ MAINTAINER= rwatson@FreeBSD.org ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_biba.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_FREE 3 .Os ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_free.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_GET 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_get.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message