From owner-cvs-all@FreeBSD.ORG  Mon Mar  1 00:37:20 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 F1C7016A4CE; Mon,  1 Mar 2004 00:37:20 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EBE5A43D2D; Mon,  1 Mar 2004 00:37:20 -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 i218bKGe080185;
	Mon, 1 Mar 2004 00:37:20 -0800 (PST)
	(envelope-from ache@repoman.freebsd.org)
Received: (from ache@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i218bK4Z080184;
	Mon, 1 Mar 2004 00:37:20 -0800 (PST)
	(envelope-from ache)
Message-Id: <200403010837.i218bK4Z080184@repoman.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Mon, 1 Mar 2004 00:37:20 -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/usr.bin/grep Makefile config.h dfa.c
 getpagesize.h grep.1 grep.c kwset.c search.c
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: Mon, 01 Mar 2004 08:37:21 -0000

ache        2004/03/01 00:37:20 PST

  FreeBSD src repository

  Modified files:
    gnu/usr.bin/grep     Makefile config.h dfa.c getpagesize.h 
                         grep.1 grep.c kwset.c search.c 
  Log:
  Merge conflicts, upgrade
  
  Revision  Changes    Path
  1.29      +1 -1      src/gnu/usr.bin/grep/Makefile
  1.7       +6 -5      src/gnu/usr.bin/grep/config.h
  1.14      +1 -1      src/gnu/usr.bin/grep/dfa.c
  1.6       +32 -24    src/gnu/usr.bin/grep/getpagesize.h
  1.24      +5 -5      src/gnu/usr.bin/grep/grep.1
  1.24      +2 -3      src/gnu/usr.bin/grep/grep.c
  1.8       +3 -1      src/gnu/usr.bin/grep/kwset.c
  1.12      +1 -1      src/gnu/usr.bin/grep/search.c