From owner-cvs-all@FreeBSD.ORG  Tue Oct  4 21:59:30 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5714116A41F;
	Tue,  4 Oct 2005 21:59:30 +0000 (GMT)
	(envelope-from stefanf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1593543D46;
	Tue,  4 Oct 2005 21:59:30 +0000 (GMT)
	(envelope-from stefanf@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 j94LxThH069246;
	Tue, 4 Oct 2005 21:59:29 GMT
	(envelope-from stefanf@repoman.freebsd.org)
Received: (from stefanf@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j94LxTND069245;
	Tue, 4 Oct 2005 21:59:29 GMT (envelope-from stefanf)
Message-Id: <200510042159.j94LxTND069245@repoman.freebsd.org>
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Tue, 4 Oct 2005 21:59:29 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/lib/libedit makelist map.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Oct 2005 21:59:30 -0000

stefanf     2005-10-04 21:59:29 UTC

  FreeBSD src repository

  Modified files:
    lib/libedit          makelist map.c 
  Log:
  Merge makelist rev 1.10 and map.c rev 1.22 from NetBSD.  They just patch the
  bug fixed in the last commit to map.c in a different way.  Follow NetBSD to
  facilitate future merges.
  
  Revision  Changes    Path
  1.10      +1 -2      src/lib/libedit/makelist
  1.12      +13 -12    src/lib/libedit/map.c