Subject: CVS commit: src
To: None <source-changes@netbsd.org>
From: Christos Zoulas <christos@netbsd.org>
List: source-changes
Date: 02/23/1999 02:47:41 
Module Name:	src
Committed By:	christos
Date:		Tue Feb 23 10:47:41 UTC 1999

Modified Files:
	src/sbin/routed: Makefile defs.h if.c input.c main.c output.c parms.c
	    pathnames.h radix.c rdisc.c routed.8 table.c trace.c
	src/sbin/routed/rtquery: rtquery.8 rtquery.c
Log Message:
Resolve conflicts.