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/fixmount | |
| 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/fixmount')
| -rw-r--r-- | contrib/amd/fixmount/fixmount.8 | 4 | ||||
| -rw-r--r-- | contrib/amd/fixmount/fixmount.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8 index 7e9793a..c2e92f3 100644 --- a/contrib/amd/fixmount/fixmount.8 +++ b/contrib/amd/fixmount/fixmount.8 @@ -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: fixmount.8,v 1.3.2.5 2003/03/16 01:46:59 ezk Exp $ +.\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $ .\" $FreeBSD$ .\" .Dd February 26, 1993 diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c index 9cfd736..3e00786 100644 --- a/contrib/amd/fixmount/fixmount.c +++ b/contrib/amd/fixmount/fixmount.c @@ -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: fixmount.c,v 1.5.2.3 2002/12/27 22:45:04 ezk Exp $ + * $Id: fixmount.c,v 1.5.2.4 2004/01/06 03:15:23 ezk Exp $ * $FreeBSD$ * */ |
