diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-31 21:42:34 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-31 21:42:34 +0000 |
| commit | 3b39b1682d02b7a4dd7244c6d9740a5fcedf1bac (patch) | |
| tree | ef16122fd3c681c8d5078f63be2ae37a568d6a53 | |
| parent | bc4d32e80bd81ea96c4c2544ab36f7e8caa777b7 (diff) | |
| download | FreeBSD-src-3b39b1682d02b7a4dd7244c6d9740a5fcedf1bac.zip FreeBSD-src-3b39b1682d02b7a4dd7244c6d9740a5fcedf1bac.tar.gz | |
Revert mismerge
| -rw-r--r-- | tools/build/options/WITH_OFED | 2 | ||||
| -rw-r--r-- | tools/regression/bin/sh/builtins/set1.0 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED index 6d9c0a1..a995fb8 100644 --- a/tools/build/options/WITH_OFED +++ b/tools/build/options/WITH_OFED @@ -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. diff --git a/tools/regression/bin/sh/builtins/set1.0 b/tools/regression/bin/sh/builtins/set1.0 index 0043f45..fc39fad 100644 --- a/tools/regression/bin/sh/builtins/set1.0 +++ b/tools/regression/bin/sh/builtins/set1.0 @@ -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 |
