From owner-cvs-src@FreeBSD.ORG  Fri Apr 18 18:56:45 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id AE69337B401; Fri, 18 Apr 2003 18:56:45 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4FB9543FA3; Fri, 18 Apr 2003 18:56:45 -0700 (PDT)
	(envelope-from mtm@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3J1uj0U070682;
	Fri, 18 Apr 2003 18:56:45 -0700 (PDT)
	(envelope-from mtm@repoman.freebsd.org)
Received: (from mtm@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3J1ujon070681;
	Fri, 18 Apr 2003 18:56:45 -0700 (PDT)
Message-Id: <200304190156.h3J1ujon070681@repoman.freebsd.org>
From: Mike Makonnen <mtm@FreeBSD.org>
Date: Fri, 18 Apr 2003 18:56:45 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/etc/rc.d Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Apr 2003 01:56:46 -0000

mtm         2003/04/18 18:56:45 PDT

  FreeBSD src repository

  Modified files:
    etc/rc.d             Makefile 
  Log:
  The changes to rc.d/network1 will not get merged in by
  mergemaster if it does not appear in the list of files to install.
  
  Revision  Changes    Path
  1.14      +1 -1      src/etc/rc.d/Makefile