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/amq | |
| parent | ccc3812476e334ade5336aa157187088e2026fd3 (diff) | |
| download | FreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.zip FreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/amd/amq')
| -rw-r--r-- | contrib/amd/amq/amq.8 | 3 | ||||
| -rw-r--r-- | contrib/amd/amq/amq.c | 8 | ||||
| -rw-r--r-- | contrib/amd/amq/pawd.1 | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8 index 7d928bb..e1dc13e 100644 --- a/contrib/amd/amq/amq.8 +++ b/contrib/amd/amq/amq.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. @@ -39,6 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp $ +.\" $Id: amq.8,v 1.3.2.7 2002/12/27 22:44:45 ezk Exp $ .\" $FreeBSD$ .\" .Dd March 16, 1991 diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c index e49cabc..56692b9 100644 --- a/contrib/amd/amq/amq.c +++ b/contrib/amd/amq/amq.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: amq.c,v 1.7.2.5 2001/01/12 22:43:43 ro Exp $ + * $Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $ * */ @@ -51,13 +51,13 @@ __FBSDID("$FreeBSD$"); #ifndef lint char copyright[] = "\ -@(#)Copyright (c) 1997-2001 Erez Zadok\n\ +@(#)Copyright (c) 1997-2003 Erez Zadok\n\ @(#)Copyright (c) 1990 Jan-Simon Pendry\n\ @(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\ @(#)Copyright (c) 1990 The Regents of the University of California.\n\ @(#)All rights reserved.\n"; #if __GNUC__ < 2 -static char rcsid[] = "$Id: amq.c,v 1.7.2.5 2001/01/12 22:43:43 ro Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $"; static char sccsid[] = "%W% (Berkeley) %G%"; #endif /* __GNUC__ < 2 */ #endif /* not lint */ diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1 index 6713907..e4471f3 100644 --- a/contrib/amd/amq/pawd.1 +++ b/contrib/amd/amq/pawd.1 @@ -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: pawd.1,v 1.2 1998/09/05 06:56:36 obrien Exp $ +.\" $Id: pawd.1,v 1.3.2.3 2002/12/27 22:44:46 ezk Exp $ .\" $FreeBSD$ .\" .Dd January 6, 1998 |
