From owner-freebsd-commit  Mon Jan 22 17:58:31 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id RAA13508
          for freebsd-commit-outgoing; Mon, 22 Jan 1996 17:58:31 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id RAA13470
          for cvs-all-outgoing; Mon, 22 Jan 1996 17:58:07 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id RAA13460
          for cvs-libexec-outgoing; Mon, 22 Jan 1996 17:58:05 -0800 (PST)
Received: (from pst@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id RAA13452
          Mon, 22 Jan 1996 17:58:03 -0800 (PST)
Date: Mon, 22 Jan 1996 17:58:03 -0800 (PST)
From: Paul Traina <pst>
Message-Id: <199601230158.RAA13452@freefall.freebsd.org>
To: CVS-committers, cvs-libexec
Subject: cvs commit: src/libexec/bootpd Makefile bootpd.c getether.c .indent.pro
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

pst         96/01/22 17:58:02

  Modified:    libexec/bootpd  Makefile bootpd.c getether.c
  Removed:     libexec/bootpd  .indent.pro
  Log:
  Fix conflicts from 2.4.3 merge
  
  Revision  Changes    Path
  1.4       +2 -2      src/libexec/bootpd/Makefile
  1.3       +51 -28    src/libexec/bootpd/bootpd.c
  1.3       +18 -9     src/libexec/bootpd/getether.c