Bill Fenner ec114097dd 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...

1999-01-20 07:55:57 +00:00

..

common

NOSHARED takes a yes/YES no/NO value, not "true, false, hey mon!".

1997-06-29 06:03:42 +00:00

map-mbone

Use foo/bar.a' instead of -Lfoo -lbar' for linking to static internal

1998-03-07 09:49:12 +00:00

mrinfo

Remove useless `BINOWN=root' now that it is the default.

1998-09-19 22:42:14 +00:00

mrouted

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

mtrace

Remove useless `BINOWN=root' now that it is the default.

1998-09-19 22:42:14 +00:00

testrsrr

Revert $FreeBSD$ to $Id$

1997-02-22 16:15:28 +00:00

callout.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

cfparse.y

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

config.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

defs.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

dvmrp.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

icmp.c

Import mrouted version 3.9-beta3+IOS12 . This is a version of 3.9-beta3

1999-01-20 07:44:18 +00:00

igmp.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

igmpv2.h

Import mrouted version 3.9-beta3+IOS12 . This is a version of 3.9-beta3

1999-01-20 07:44:18 +00:00

inet.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

ipip.c

Import mrouted version 3.9-beta3+IOS12 . This is a version of 3.9-beta3

1999-01-20 07:44:18 +00:00

kern.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

LICENSE

…

main.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

Makefile

Revert $FreeBSD$ to $Id$

1997-02-22 16:15:28 +00:00

Makefile.inc

Use foo/bar.a' instead of -Lfoo -lbar' for linking to static internal

1998-03-07 09:49:12 +00:00

map-mbone.8

Sort cross references.

1998-08-31 16:41:09 +00:00

mapper.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

mrinfo.8

Sort cross references.

1998-08-31 16:41:09 +00:00

mrinfo.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

mrouted.8

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

mrouted.conf

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

mtrace.8

Resolve conflicts.

1999-01-20 05:13:42 +00:00

mtrace.c

Resolve conflicts.

1999-01-20 05:13:42 +00:00

mtrace.h

Import mtrace release 5.2

1999-01-20 05:11:48 +00:00

pathnames.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

prune.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

prune.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

RELEASE

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

route.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

route.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

rsrr_var.h

…

rsrr.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

rsrr.h

use strncpy correctly

1998-06-09 05:01:38 +00:00

VERSION

Import mrouted version 3.9-beta3+IOS12 . This is a version of 3.9-beta3

1999-01-20 07:44:18 +00:00

vif.c

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00

vif.h

Merge conflicts from 3.9-beta3+IOS12. The conflicts were huge; cvs's

1999-01-20 07:55:57 +00:00