Module Name:	gnusrc
Committed By:	wiz
Date:		Sun Feb 27 00:22:19 UTC 2000

Update of /cvsroot/gnusrc/gnu/dist/grep
In directory nb00:/tmp/cvs-serv26383

Log Message:
Update GNU grep to 2.4


Vendor Tag:	FSF
Release Tags:	grep-2-4
		
U gnusrc/gnu/dist/grep/README
U gnusrc/gnu/dist/grep/stamp-h.in
U gnusrc/gnu/dist/grep/ABOUT-NLS
U gnusrc/gnu/dist/grep/AUTHORS
U gnusrc/gnu/dist/grep/COPYING
U gnusrc/gnu/dist/grep/ChangeLog
U gnusrc/gnu/dist/grep/INSTALL
U gnusrc/gnu/dist/grep/Makefile.am
U gnusrc/gnu/dist/grep/Makefile.in
U gnusrc/gnu/dist/grep/NEWS
U gnusrc/gnu/dist/grep/THANKS
U gnusrc/gnu/dist/grep/TODO
U gnusrc/gnu/dist/grep/acconfig.h
N gnusrc/gnu/dist/grep/acinclude.m4
U gnusrc/gnu/dist/grep/aclocal.m4
N gnusrc/gnu/dist/grep/config.guess
U gnusrc/gnu/dist/grep/config.hin
N gnusrc/gnu/dist/grep/config.sub
U gnusrc/gnu/dist/grep/configure
U gnusrc/gnu/dist/grep/configure.in
U gnusrc/gnu/dist/grep/install-sh
U gnusrc/gnu/dist/grep/missing
U gnusrc/gnu/dist/grep/mkinstalldirs
N gnusrc/gnu/dist/grep/PATCHES.AC
N gnusrc/gnu/dist/grep/PATCHES.AM
U gnusrc/gnu/dist/grep/po/ChangeLog
U gnusrc/gnu/dist/grep/po/Makefile.in.in
U gnusrc/gnu/dist/grep/po/POTFILES.in
U gnusrc/gnu/dist/grep/po/grep.pot
U gnusrc/gnu/dist/grep/po/stamp-cat-id
U gnusrc/gnu/dist/grep/po/de.po
U gnusrc/gnu/dist/grep/po/es.po
U gnusrc/gnu/dist/grep/po/el.po
U gnusrc/gnu/dist/grep/po/fr.po
U gnusrc/gnu/dist/grep/po/ko.po
U gnusrc/gnu/dist/grep/po/nl.po
U gnusrc/gnu/dist/grep/po/no.po
U gnusrc/gnu/dist/grep/po/pl.po
N gnusrc/gnu/dist/grep/po/pt_BR.po
U gnusrc/gnu/dist/grep/po/ru.po
U gnusrc/gnu/dist/grep/po/sl.po
U gnusrc/gnu/dist/grep/po/sv.po
U gnusrc/gnu/dist/grep/po/de.gmo
U gnusrc/gnu/dist/grep/po/es.gmo
U gnusrc/gnu/dist/grep/po/el.gmo
U gnusrc/gnu/dist/grep/po/fr.gmo
U gnusrc/gnu/dist/grep/po/ko.gmo
U gnusrc/gnu/dist/grep/po/nl.gmo
U gnusrc/gnu/dist/grep/po/no.gmo
U gnusrc/gnu/dist/grep/po/pl.gmo
N gnusrc/gnu/dist/grep/po/pt_BR.gmo
U gnusrc/gnu/dist/grep/po/ru.gmo
U gnusrc/gnu/dist/grep/po/sl.gmo
U gnusrc/gnu/dist/grep/po/sv.gmo
U gnusrc/gnu/dist/grep/po/cat-id-tbl.c
U gnusrc/gnu/dist/grep/intl/ChangeLog
U gnusrc/gnu/dist/grep/intl/Makefile.in
U gnusrc/gnu/dist/grep/intl/linux-msg.sed
U gnusrc/gnu/dist/grep/intl/po2tbl.sed.in
U gnusrc/gnu/dist/grep/intl/xopen-msg.sed
U gnusrc/gnu/dist/grep/intl/gettext.h
U gnusrc/gnu/dist/grep/intl/gettextP.h
U gnusrc/gnu/dist/grep/intl/hash-string.h
U gnusrc/gnu/dist/grep/intl/libgettext.h
U gnusrc/gnu/dist/grep/intl/loadinfo.h
U gnusrc/gnu/dist/grep/intl/bindtextdom.c
U gnusrc/gnu/dist/grep/intl/dcgettext.c
U gnusrc/gnu/dist/grep/intl/dgettext.c
U gnusrc/gnu/dist/grep/intl/gettext.c
U gnusrc/gnu/dist/grep/intl/finddomain.c
U gnusrc/gnu/dist/grep/intl/loadmsgcat.c
U gnusrc/gnu/dist/grep/intl/localealias.c
U gnusrc/gnu/dist/grep/intl/textdomain.c
U gnusrc/gnu/dist/grep/intl/l10nflist.c
U gnusrc/gnu/dist/grep/intl/explodename.c
U gnusrc/gnu/dist/grep/intl/intl-compat.c
U gnusrc/gnu/dist/grep/intl/VERSION
U gnusrc/gnu/dist/grep/intl/cat-compat.c
U gnusrc/gnu/dist/grep/doc/Makefile.am
U gnusrc/gnu/dist/grep/doc/Makefile.in
U gnusrc/gnu/dist/grep/doc/mdate-sh
U gnusrc/gnu/dist/grep/doc/stamp-vti
C gnusrc/gnu/dist/grep/doc/texinfo.tex
U gnusrc/gnu/dist/grep/doc/version.texi
C gnusrc/gnu/dist/grep/doc/grep.texi
C gnusrc/gnu/dist/grep/doc/grep.1
U gnusrc/gnu/dist/grep/doc/egrep.man
U gnusrc/gnu/dist/grep/doc/fgrep.man
C gnusrc/gnu/dist/grep/doc/grep.info
U gnusrc/gnu/dist/grep/src/Makefile.am
U gnusrc/gnu/dist/grep/src/Makefile.in
U gnusrc/gnu/dist/grep/src/alloca.c
U gnusrc/gnu/dist/grep/src/memchr.c
U gnusrc/gnu/dist/grep/src/stpcpy.c
C gnusrc/gnu/dist/grep/src/grep.c
U gnusrc/gnu/dist/grep/src/grep.h
U gnusrc/gnu/dist/grep/src/dfa.c
U gnusrc/gnu/dist/grep/src/dfa.h
U gnusrc/gnu/dist/grep/src/kwset.c
U gnusrc/gnu/dist/grep/src/kwset.h
U gnusrc/gnu/dist/grep/src/obstack.c
U gnusrc/gnu/dist/grep/src/obstack.h
U gnusrc/gnu/dist/grep/src/regex.c
U gnusrc/gnu/dist/grep/src/regex.h
U gnusrc/gnu/dist/grep/src/savedir.c
U gnusrc/gnu/dist/grep/src/savedir.h
U gnusrc/gnu/dist/grep/src/getopt.c
U gnusrc/gnu/dist/grep/src/getopt1.c
U gnusrc/gnu/dist/grep/src/getopt.h
U gnusrc/gnu/dist/grep/src/search.c
U gnusrc/gnu/dist/grep/src/getpagesize.h
U gnusrc/gnu/dist/grep/src/system.h
U gnusrc/gnu/dist/grep/src/grepmat.c
U gnusrc/gnu/dist/grep/src/egrepmat.c
U gnusrc/gnu/dist/grep/src/fgrepmat.c
U gnusrc/gnu/dist/grep/src/dosbuf.c
U gnusrc/gnu/dist/grep/src/vms_fab.c
U gnusrc/gnu/dist/grep/src/vms_fab.h

5 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jFSF:yesterday -jFSF gnusrc/gnu/dist/grep