Date: Thu, 10 Aug 2000 00:54:33 -0700 (PDT) From: Sheldon Hearn <sheldonh@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sbin/routed if.c main.c rdisc.c table.c Message-ID: <200008100754.AAA56143@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
sheldonh 2000/08/10 00:54:33 PDT
Modified files:
sbin/routed if.c main.c rdisc.c table.c
Log:
Resolve conflicts.
Revision Changes Path
1.7 +4 -1 src/sbin/routed/if.c
1.13 +1 -1 src/sbin/routed/main.c
1.7 +1 -1 src/sbin/routed/rdisc.c
1.14 +4 -2 src/sbin/routed/table.c
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?200008100754.AAA56143>
