From owner-p4-projects@FreeBSD.ORG  Sun Aug 26 11:53:10 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CBF3C106566C; Sun, 26 Aug 2012 11:53:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 82DE5106566B
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:53:09 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CA7C8FC0C
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:53:09 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QBr9Ug044749
	for <perforce@freebsd.org>; Sun, 26 Aug 2012 11:53:09 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QBr9np044746
	for perforce@freebsd.org; Sun, 26 Aug 2012 11:53:09 GMT
	(envelope-from brooks@freebsd.org)
Date: Sun, 26 Aug 2012 11:53:09 GMT
Message-Id: <201208261153.q7QBr9np044746@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 216530 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 26 Aug 2012 11:53:10 -0000

http://p4web.freebsd.org/@@216530?ac=10

Change 216530 by brooks@brooks_zenith on 2012/08/26 11:52:48

	Use LOCAL_MTREE to avoid patching BSD.usr.dist since we are
	highly unlikely to merge the usr/share/images directory.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/ctsrd.mtree#1 add
.. //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#4 (text+ko) ====

@@ -330,8 +330,6 @@
             fortune
             ..
         ..
-        images
-        ..
         info
 	..
 	i18n