diff options
| author | mbr <mbr@FreeBSD.org> | 2004-07-06 13:16:49 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2004-07-06 13:16:49 +0000 |
| commit | f86bd4438348a45ae26eb8365fb8ffacad95cbac (patch) | |
| tree | 10313fb55a48b5a446a0e0f09956b5f55af7b430 /contrib/amd/conf/nfs_prot | |
| parent | fdcc83dc591340586aa12b852098f8331b918783 (diff) | |
| download | FreeBSD-src-f86bd4438348a45ae26eb8365fb8ffacad95cbac.zip FreeBSD-src-f86bd4438348a45ae26eb8365fb8ffacad95cbac.tar.gz | |
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
Diffstat (limited to 'contrib/amd/conf/nfs_prot')
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 4 | ||||
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h index b0a66c3..24bc9b3 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd2.h,v 1.3.2.3 2002/12/27 22:44:54 ezk Exp $ + * $Id: nfs_prot_freebsd2.h,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index c392497..27c535d 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.5.2.6 2003/08/27 19:35:16 ib42 Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $ * $FreeBSD$ * */ |
