From owner-p4-projects@FreeBSD.ORG  Tue Oct 22 20:39:47 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 69E5B893; Tue, 22 Oct 2013 20:39:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CA337888
 for <perforce@freebsd.org>; Tue, 22 Oct 2013 20:39:46 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7048268F
 for <perforce@freebsd.org>; Tue, 22 Oct 2013 20:39:46 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MKdkTV047393
 for <perforce@freebsd.org>; Tue, 22 Oct 2013 20:39:46 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r9MKdkhM047390
 for perforce@freebsd.org; Tue, 22 Oct 2013 20:39:46 GMT
 (envelope-from brooks@freebsd.org)
Date: Tue, 22 Oct 2013 20:39:46 GMT
Message-Id: <201310222039.r9MKdkhM047390@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 1187168 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: Tue, 22 Oct 2013 20:39:47 -0000

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

Change 1187168 by brooks@brooks_zenith on 2013/10/22 20:39:26

	Fix a merge error.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/tools/build/options/WITHOUT_RCS#5 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/tools/build/options/WITHOUT_RCS#5 (text) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru $
+.\" $FreeBSD: head/tools/build/options/WITHOUT_RCS 256198 2013-10-09 17:07:20Z gjb $
 Set to not build
 .Xr rcs 1
 and related utilities.