From owner-svn-src-projects@FreeBSD.ORG  Tue May 31 21:42:34 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC765106566B;
	Tue, 31 May 2011 21:42:34 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AC19B8FC08;
	Tue, 31 May 2011 21:42:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4VLgYHX041339;
	Tue, 31 May 2011 21:42:34 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4VLgYZN041336;
	Tue, 31 May 2011 21:42:34 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201105312142.p4VLgYZN041336@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 31 May 2011 21:42:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222549 - in projects/largeSMP/tools: build/options
	regression/bin/sh/builtins
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 May 2011 21:42:34 -0000

Author: attilio
Date: Tue May 31 21:42:34 2011
New Revision: 222549
URL: http://svn.freebsd.org/changeset/base/222549

Log:
  Revert mismerge

Modified:
  projects/largeSMP/tools/build/options/WITH_OFED
  projects/largeSMP/tools/regression/bin/sh/builtins/set1.0

Modified: projects/largeSMP/tools/build/options/WITH_OFED
==============================================================================
--- projects/largeSMP/tools/build/options/WITH_OFED	Tue May 31 21:22:44 2011	(r222548)
+++ projects/largeSMP/tools/build/options/WITH_OFED	Tue May 31 21:42:34 2011	(r222549)
@@ -1,4 +1,4 @@
-.\" $FreeBSD: projects/largeSMP/tools/build/options/WITH_OFED 222016 2011-05-17 11:06:41Z ru $
+.\" $FreeBSD$
 Set to build the
 .Dq "OpenFabrics Enterprise Distribution"
 Infiniband software stack.

Modified: projects/largeSMP/tools/regression/bin/sh/builtins/set1.0
==============================================================================
--- projects/largeSMP/tools/regression/bin/sh/builtins/set1.0	Tue May 31 21:22:44 2011	(r222548)
+++ projects/largeSMP/tools/regression/bin/sh/builtins/set1.0	Tue May 31 21:42:34 2011	(r222549)
@@ -1,4 +1,4 @@
-# $FreeBSD: projects/largeSMP/tools/regression/bin/sh/builtins/set1.0 222451 2011-05-29 15:02:10Z jilles $
+# $FreeBSD$
 
 set +C
 set +f