CVS commit: src/external/bsd/byacc

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

Module Name:    src
Committed By:   christos
Date:           Sun Oct  6 23:29:42 UTC 2019

Modified Files:
        src/external/bsd/byacc/dist: config.guess config.sub config_h.in defs.h
            main.c yacc.1
        src/external/bsd/byacc/include: config.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/config.guess \
    src/external/bsd/byacc/dist/config.sub
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/config_h.in
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/byacc/dist/main.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/include/config.h

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