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

…

map-mbone

…

mrinfo

…

mrouted

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

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

mtrace

…

testrsrr

…

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

…

Makefile.inc

…

map-mbone.8

…

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

…

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

…

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

…

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