Date: Tue, 19 Jan 1999 23:55:58 -0800 (PST) From: Bill Fenner <fenner@FreeBSD.ORG> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: cvs commit: src/usr.sbin/mrouted RELEASE callout.c cfparse.y config.c defs.h dvmrp.h igmp.c inet.c kern.c main.c mapper.c mrinfo.c mrouted.8 mrouted.conf pathnames.h prune.c prune.h route.c route.h rsrr.c vif.c vif.h src/usr.sbin/mrouted/mrouted ... Message-ID: <199901200755.XAA17707@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
fenner 1999/01/19 23:55:58 PST
Modified files:
usr.sbin/mrouted RELEASE callout.c cfparse.y config.c
defs.h dvmrp.h igmp.c inet.c kern.c
main.c mapper.c mrinfo.c mrouted.8
mrouted.conf pathnames.h prune.c prune.h
route.c route.h rsrr.c vif.c vif.h
usr.sbin/mrouted/mrouted Makefile
Log:
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...
Revision Changes Path
1.3 +179 -12 src/usr.sbin/mrouted/RELEASE
1.11 +88 -66 src/usr.sbin/mrouted/callout.c
1.9 +358 -83 src/usr.sbin/mrouted/cfparse.y
1.13 +46 -20 src/usr.sbin/mrouted/config.c
1.11 +188 -105 src/usr.sbin/mrouted/defs.h
1.8 +9 -11 src/usr.sbin/mrouted/dvmrp.h
1.15 +123 -143 src/usr.sbin/mrouted/igmp.c
1.10 +4 -1 src/usr.sbin/mrouted/inet.c
1.11 +110 -7 src/usr.sbin/mrouted/kern.c
1.15 +496 -197 src/usr.sbin/mrouted/main.c
1.14 +4 -2 src/usr.sbin/mrouted/mapper.c
1.16 +13 -8 src/usr.sbin/mrouted/mrinfo.c
1.12 +262 -99 src/usr.sbin/mrouted/mrouted.8
1.8 +2 -1 src/usr.sbin/mrouted/mrouted.conf
1.6 +2 -1 src/usr.sbin/mrouted/pathnames.h
1.16 +796 -480 src/usr.sbin/mrouted/prune.c
1.9 +12 -3 src/usr.sbin/mrouted/prune.h
1.11 +596 -293 src/usr.sbin/mrouted/route.c
1.8 +7 -5 src/usr.sbin/mrouted/route.h
1.7 +28 -62 src/usr.sbin/mrouted/rsrr.c
1.14 +660 -242 src/usr.sbin/mrouted/vif.c
1.9 +179 -21 src/usr.sbin/mrouted/vif.h
1.11 +8 -2 src/usr.sbin/mrouted/mrouted/Makefile
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901200755.XAA17707>