CVS commit: src/external/bsd/flex

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sun Dec 23 16:27:17 UTC 2018

Modified Files:
        src/external/bsd/flex/bin: Makefile
        src/external/bsd/flex/dist/src: dfa.c filter.c flex.skl flexdef.h
            flexint.h misc.c regex.c scan.l
        src/external/bsd/flex/include: config.h
Removed Files:
        src/external/bsd/flex/dist/lib: Makefile.am Makefile.in reallocarray.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/flex/dist/lib/Makefile.am \
    src/external/bsd/flex/dist/lib/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/lib/reallocarray.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/dfa.c \
    src/external/bsd/flex/dist/src/filter.c \
    src/external/bsd/flex/dist/src/misc.c \
    src/external/bsd/flex/dist/src/regex.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/flexdef.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/src/flexint.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/scan.l
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.