From owner-cvs-all@FreeBSD.ORG  Tue Feb 24 18:39:10 2004
Return-Path: <owner-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 E429516A4CE; Tue, 24 Feb 2004 18:39:10 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C938243D1D; Tue, 24 Feb 2004 18:39:10 -0800 (PST)
	(envelope-from ache@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1P2dAGe043115;
	Tue, 24 Feb 2004 18:39:10 -0800 (PST)
	(envelope-from ache@repoman.freebsd.org)
Received: (from ache@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1P2dA3b043114;
	Tue, 24 Feb 2004 18:39:10 -0800 (PST)
	(envelope-from ache)
Message-Id: <200402250239.i1P2dA3b043114@repoman.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Tue, 24 Feb 2004 18:39:10 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/gnu/lib/libregex regex.c regex.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 25 Feb 2004 02:39:11 -0000

ache        2004/02/24 18:39:10 PST

  FreeBSD src repository

  Modified files:
    gnu/lib/libregex     regex.c regex.h 
  Log:
  Merge conflicts
  
  Revision  Changes     Path
  1.11      +1687 -899  src/gnu/lib/libregex/regex.c
  1.5       +24 -494    src/gnu/lib/libregex/regex.h