From owner-cvs-usrsbin  Wed Aug 16 21:57:38 1995
Return-Path: cvs-usrsbin-owner
Received: (from majordom@localhost)
          by freefall.FreeBSD.org (8.6.11/8.6.6) id VAA18688
          for cvs-usrsbin-outgoing; Wed, 16 Aug 1995 21:57:38 -0700
Received: (from peter@localhost)
          by freefall.FreeBSD.org (8.6.11/8.6.6) id VAA18671
          ; Wed, 16 Aug 1995 21:57:27 -0700
Date: Wed, 16 Aug 1995 21:57:27 -0700
From: Peter Wemm <peter>
Message-Id: <199508170457.VAA18671@freefall.FreeBSD.org>
To: CVS-commiters, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/sendmail/src daemon.c deliver.c readcf.c
Sender: cvs-usrsbin-owner@FreeBSD.org
Precedence: bulk

peter       95/08/16 21:57:25

  Modified:    usr.sbin/sendmail/src  daemon.c deliver.c readcf.c
  Log:
  Merge in the remaining differences from 8.6.11 to 8.6.12.
  Note that conf.c, although there was an import conflict, it did not
  require intervention, as it was the $Id$ tag. It would have become
  rev 1.8 on checkout so there's no point changing it from 1.7 to
  1.1.1.3 as the "-j" option wanted to do.. Trust me.. :-)