aboutsummaryrefslogtreecommitdiff
path: root/contrib/sendmail/cf/sh
diff options
context:
space:
mode:
authorGregory Neil Shapiro <gshapiro@FreeBSD.org>2000-08-12 22:19:16 +0000
committerGregory Neil Shapiro <gshapiro@FreeBSD.org>2000-08-12 22:19:16 +0000
commit3299c2f12320115fa2829485837e0c3b543c62ba (patch)
treea34a871470f695719c38b373a368a7e3405fbcc6 /contrib/sendmail/cf/sh
parente8c96e01af86960b1b142e495910f573695971dd (diff)
downloadsrc-3299c2f12320115fa2829485837e0c3b543c62ba.tar.gz
src-3299c2f12320115fa2829485837e0c3b543c62ba.zip
Fix conflicts from merge of sendmail 8.11.0.
PR: bin/11552 misc/18512 bin/15088
Notes
Notes: svn path=/head/; revision=64565
Diffstat (limited to 'contrib/sendmail/cf/sh')
-rw-r--r--contrib/sendmail/cf/sh/makeinfo.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh
index 91de99b68d01..8fb371c2c66e 100644
--- a/contrib/sendmail/cf/sh/makeinfo.sh
+++ b/contrib/sendmail/cf/sh/makeinfo.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 1998 Sendmail, Inc. All rights reserved.
+# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
# The Regents of the University of California. All rights reserved.
@@ -10,7 +11,9 @@
# the sendmail distribution.
#
#
-# @(#)makeinfo.sh 8.11 (Berkeley) 5/19/1998
+# $Id: makeinfo.sh,v 8.14 1999/02/07 07:26:25 gshapiro Exp $
+#
+# $FreeBSD$
#
usewhoami=0