From owner-cvs-src@FreeBSD.ORG  Sun Jan 30 02:32:17 2005
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 7D2B516A4CE; Sun, 30 Jan 2005 02:32:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4658C43D31; Sun, 30 Jan 2005 02:32:17 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0U2WHDJ078316;
	Sun, 30 Jan 2005 02:32:17 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0U2WHuU078315;
	Sun, 30 Jan 2005 02:32:17 GMT
	(envelope-from rwatson)
Message-Id: <200501300232.j0U2WHuU078315@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 30 Jan 2005 02:32:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/conf majors
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: Sun, 30 Jan 2005 02:32:17 -0000

rwatson     2005-01-30 02:32:17 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/conf             majors 
  Log:
  Merge majors.c:1.204-1.205 from HEAD to RELENG_5, modulo a slight wording
  tweak because 5.x is neither 4-STABLE nor -CURRENT:
  
    date: 2004/12/27 18:21:39;  author: imp;  state: Exp;  lines: +3 -0
    Add note about where major numbers are now assigned
  
    date: 2004/12/27 18:58:57;  author: imp;  state: Exp;  lines: +1 -1
    nos->now typo reported by njl
  
  Revision   Changes    Path
  1.201.2.1  +3 -0      src/sys/conf/majors