cvs commit: src/gnu/usr.bin/grep Makefile config.h dfa.c getpagesize.h grep.1 grep.c kwset.c search.c

[Andrey A. Chernov]

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