CVS commit: src/external/bsd/byacc/dist

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

Module Name:    src
Committed By:   christos
Date:           Sat Jan  9 22:05:33 UTC 2016

Modified Files:
        src/external/bsd/byacc/dist: closure.c defs.h error.c graph.c lalr.c
            lr0.c main.c mkpar.c mstring.c output.c reader.c symtab.c verbose.c
            warshall.c yacc.1 yaccpar.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/closure.c \
    src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \
    src/external/bsd/byacc/dist/symtab.c \
    src/external/bsd/byacc/dist/verbose.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/graph.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/lalr.c \
    src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/warshall.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/yaccpar.c

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