From owner-cvs-src@FreeBSD.ORG  Wed Jun 25 11:49:37 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 D4CE337B401; Wed, 25 Jun 2003 11:49:37 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 20F7143FE0; Wed, 25 Jun 2003 11:49:37 -0700 (PDT)
	(envelope-from obrien@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 h5PIna0U089216;
	Wed, 25 Jun 2003 11:49:36 -0700 (PDT)
	(envelope-from obrien@repoman.freebsd.org)
Received: (from obrien@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5PInaxC089215;
	Wed, 25 Jun 2003 11:49:36 -0700 (PDT)
Message-Id: <200306251849.h5PInaxC089215@repoman.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 25 Jun 2003 11:49:36 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/include stdlib.h
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: Wed, 25 Jun 2003 18:49:38 -0000

obrien      2003/06/25 11:49:36 PDT

  FreeBSD src repository

  Modified files:
    include              stdlib.h 
  Log:
  Fix a mismerge.
  
  Revision  Changes    Path
  1.53      +1 -1      src/include/stdlib.h