aboutsummaryrefslogtreecommitdiff
path: root/contrib/amd/amd/amd.c
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2004-07-06 13:16:49 +0000
committerMartin Blapp <mbr@FreeBSD.org>2004-07-06 13:16:49 +0000
commit472c8565d6d26f24551eb7e931c03f28b37b4b0a (patch)
tree10313fb55a48b5a446a0e0f09956b5f55af7b430 /contrib/amd/amd/amd.c
parent6e3bceb12b90b887fc0925d8c0a711752f5bcbd9 (diff)
downloadsrc-472c8565d6d26f24551eb7e931c03f28b37b4b0a.tar.gz
src-472c8565d6d26f24551eb7e931c03f28b37b4b0a.zip
Resolve conflicts for am-utils-6.0-10p1 (am-utils-6.0-20040513)
import: - Fix typo in amd/nfs_prot_svc.c - Manpage change in scripts/amd.conf.5 - Remove unneeded configure files - Remove unneeded m4/macros
Notes
Notes: svn path=/head/; revision=131706
Diffstat (limited to 'contrib/amd/amd/amd.c')
-rw-r--r--contrib/amd/amd/amd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 1cc97b7993c3..f724bd833f12 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 1997-2004 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: amd.c,v 1.8.2.5 2002/12/27 22:44:29 ezk Exp $
+ * $Id: amd.c,v 1.8.2.6 2004/01/06 03:15:16 ezk Exp $
* $FreeBSD$
*
*/