From owner-cvs-src@FreeBSD.ORG  Fri Apr  4 23:25:08 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71DDD1065675;
	Fri,  4 Apr 2008 23:25:08 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 34F328FC21;
	Fri,  4 Apr 2008 23:25:08 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34NP80O032403;
	Fri, 4 Apr 2008 23:25:08 GMT
	(envelope-from cperciva@repoman.freebsd.org)
Received: (from cperciva@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34NP8C4032402;
	Fri, 4 Apr 2008 23:25:08 GMT (envelope-from cperciva)
Message-Id: <200804042325.m34NP8C4032402@repoman.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 4 Apr 2008 23:25:08 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/etc freebsd-update.conf
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 04 Apr 2008 23:25:08 -0000

cperciva    2008-04-04 23:25:08 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    etc                  freebsd-update.conf 
  Log:
  MFC revision 1.4: Add /boot/devices.hints to the default list of files
  which have local modifications merged during upgrading.
  
  Revision  Changes    Path
  1.1.2.4   +1 -1      src/etc/freebsd-update.conf