From owner-freebsd-commit  Sat Jan  6 13:01:06 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA16538
          for freebsd-commit-outgoing; Sat, 6 Jan 1996 13:01:06 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA16522
          for cvs-all-outgoing; Sat, 6 Jan 1996 13:00:59 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA16510
          for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 13:00:55 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id NAA16495
          Sat, 6 Jan 1996 13:00:49 -0800 (PST)
Date: Sat, 6 Jan 1996 13:00:49 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199601062100.NAA16495@freefall.freebsd.org>
To: CVS-committers, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/mrouted - Imported sources
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

peter       96/01/06 13:00:47

  Branch:      usr.sbin/mrouted  1.1.1
  Log:
  This is a 'for reference' import of mrouted release 3.6.  It's pure
  conflict markers, but it actually changes nothing.
  
  We've been running this code with small changes for some time, this may
  be useful for checking what those changes.  It was unfortunate this
  module got so far away from the vendor branch (whitespace changes didn't
  help)
  
  Status:
  
  Vendor Tag:	XEROX
  Release Tags:	release_3_6
  
  U src/usr.sbin/mrouted/LICENSE
  C src/usr.sbin/mrouted/callout.c
  C src/usr.sbin/mrouted/cfparse.y
  C src/usr.sbin/mrouted/config.c
  C src/usr.sbin/mrouted/defs.h
  C src/usr.sbin/mrouted/dvmrp.h
  C src/usr.sbin/mrouted/igmp.c
  C src/usr.sbin/mrouted/inet.c
  C src/usr.sbin/mrouted/kern.c
  C src/usr.sbin/mrouted/main.c
  C src/usr.sbin/mrouted/map-mbone.8
  C src/usr.sbin/mrouted/mapper.c
  C src/usr.sbin/mrouted/mrinfo.8
  C src/usr.sbin/mrouted/mrinfo.c
  C src/usr.sbin/mrouted/mrouted.8
  C src/usr.sbin/mrouted/mtrace.8
  C src/usr.sbin/mrouted/mtrace.c
  C src/usr.sbin/mrouted/pathnames.h
  C src/usr.sbin/mrouted/prune.c
  C src/usr.sbin/mrouted/prune.h
  C src/usr.sbin/mrouted/route.c
  C src/usr.sbin/mrouted/route.h
  C src/usr.sbin/mrouted/rsrr.c
  C src/usr.sbin/mrouted/rsrr.h
  C src/usr.sbin/mrouted/rsrr_var.h
  C src/usr.sbin/mrouted/vif.c
  C src/usr.sbin/mrouted/vif.h
  C src/usr.sbin/mrouted/mrouted.conf
  
  27 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jXEROX:yesterday -jXEROX src/usr.sbin/mrouted