diff options
| author | mbr <mbr@FreeBSD.org> | 2003-09-02 15:42:57 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2003-09-02 15:42:57 +0000 |
| commit | fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9 (patch) | |
| tree | 361063e0f962fb2fd69f626b26e596899c16d3cd /contrib/amd/fixmount | |
| parent | ccc3812476e334ade5336aa157187088e2026fd3 (diff) | |
| download | FreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.zip FreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.tar.gz | |
Resolve conflicts.
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 0f2c9e6..7e9793a 100644 --- a/contrib/amd/fixmount/fixmount.8 +++ b/contrib/amd/fixmount/fixmount.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-1999 Erez Zadok +.\" Copyright (c) 1997-2003 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.2 1999/01/10 21:54:26 ezk Exp $ +.\" $Id: fixmount.8,v 1.3.2.5 2003/03/16 01:46:59 ezk Exp $ .\" $FreeBSD$ .\" .Dd February 26, 1993 diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c index f582724..9cfd736 100644 --- a/contrib/amd/fixmount/fixmount.c +++ b/contrib/amd/fixmount/fixmount.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2001 Erez Zadok + * Copyright (c) 1997-2003 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.1 2001/01/10 03:23:32 ezk Exp $ + * $Id: fixmount.c,v 1.5.2.3 2002/12/27 22:45:04 ezk Exp $ * $FreeBSD$ * */ |
