From owner-p4-projects@FreeBSD.ORG  Fri Nov  9 22:33:24 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 5E22FC72; Fri,  9 Nov 2012 22:33:24 +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 1A01EC70
 for <perforce@freebsd.org>; Fri,  9 Nov 2012 22:33:24 +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 0069F8FC0C
 for <perforce@freebsd.org>; Fri,  9 Nov 2012 22:33:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qA9MXNIP021792
 for <perforce@freebsd.org>; Fri, 9 Nov 2012 22:33:23 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qA9MXNxc021789
 for perforce@freebsd.org; Fri, 9 Nov 2012 22:33:23 GMT
 (envelope-from brooks@freebsd.org)
Date: Fri, 9 Nov 2012 22:33:23 GMT
Message-Id: <201211092233.qA9MXNxc021789@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219711 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 09 Nov 2012 22:33:24 -0000

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

Change 219711 by brooks@brooks_zenith on 2012/11/09 22:32:29

	Integrate cheripoint from the beribsd branch.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#8 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/cheripoint.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/images/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/images/header.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/images/sb-icons.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/images/sri.png#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/cheripoint/images/ucam.png#1 branch

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#8 (text+ko) ====

@@ -1,6 +1,7 @@
 .include <bsd.own.mk>
 
 SUBDIR=		browser \
+		cheripoint \
 		cycle_led \
 		flashit \
 		libexec \