diff options
| author | fenner <fenner@FreeBSD.org> | 1999-01-20 07:55:57 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 1999-01-20 07:55:57 +0000 |
| commit | cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8 (patch) | |
| tree | ccf540c94528b6508bed4892f971ca6ff14c68a7 /usr.sbin/mrouted/inet.c | |
| parent | 1de14dda19dab2b943562326a3d97281534dc709 (diff) | |
| download | FreeBSD-src-cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8.zip FreeBSD-src-cdafdeb1c3a36e7c0b59fd4f6f0b90b3b1cc27f8.tar.gz | |
Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's
merge algorithm failed on several files, and the translation of the
mrouted man page to mdoc didn't help...
Diffstat (limited to 'usr.sbin/mrouted/inet.c')
| -rw-r--r-- | usr.sbin/mrouted/inet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c index 5af7218..fb10161 100644 --- a/usr.sbin/mrouted/inet.c +++ b/usr.sbin/mrouted/inet.c @@ -5,11 +5,14 @@ * * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of * Leland Stanford Junior University. + * + * + * inet.c,v 3.8.4.2 1998/01/06 01:57:44 fenner Exp */ #ifndef lint static const char rcsid[] = - "$Id$"; + "$Id: inet.c,v 1.9 1998/01/16 07:17:42 charnier Exp $"; #endif /* not lint */ #include "defs.h" |
