From owner-cvs-sbin Tue Nov 19 12:27:21 1996 Return-Path: owner-cvs-sbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA01637 for cvs-sbin-outgoing; Tue, 19 Nov 1996 12:27:21 -0800 (PST) Received: (from wollman@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id MAA01550; Tue, 19 Nov 1996 12:27:01 -0800 (PST) Date: Tue, 19 Nov 1996 12:27:01 -0800 (PST) From: Garrett Wollman Message-Id: <199611192027.MAA01550@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sbin Subject: cvs commit: src/sbin/routed - Imported sources Sender: owner-cvs-sbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wollman 96/11/19 12:26:59 src/sbin/routed - Imported sources Update of /home/ncvs/src/sbin/routed In directory freefall.freebsd.org:/a/wollman/routed.libmd Revision/Branch: 1.1.1 Log Message: Last import was botched. Fix it. Status: Vendor Tag: SGI Release Tags: vjs_961119 U src/sbin/routed/radix.h C src/sbin/routed/defs.h U src/sbin/routed/if.c U src/sbin/routed/input.c U src/sbin/routed/main.c N src/sbin/routed/md5.c U src/sbin/routed/output.c U src/sbin/routed/parms.c U src/sbin/routed/pathnames.h U src/sbin/routed/radix.c U src/sbin/routed/rdisc.c U src/sbin/routed/routed.8 U src/sbin/routed/routed.h U src/sbin/routed/table.c C src/sbin/routed/Makefile U src/sbin/routed/trace.c U src/sbin/routed/rtquery/Makefile U src/sbin/routed/rtquery/rtquery.c U src/sbin/routed/rtquery/rtquery.8 U src/sbin/routed/rtquery/md5.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jSGI:yesterday -jSGI src/sbin/routed