svn commit: r222549 - in projects/largeSMP/tools: build/options regression/bin/sh/builtins

[Attilio Rao]

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