Module Name: src
Committed By: christos
Date: Tue Feb 18 21:12:21 UTC 2020
Modified Files:
src/external/historical/nawk/bin: Makefile
src/external/historical/nawk/dist: FIXES awk.1 awk.h awkgram.y b.c
lex.c lib.c main.c makefile maketab.c parse.c proctab.c proto.h
run.c tran.c ytab.c ytab.h
Removed Files:
src/external/historical/nawk/dist: README
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/historical/nawk/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/historical/nawk/dist/FIXES \
src/external/historical/nawk/dist/awk.1 \
src/external/historical/nawk/dist/maketab.c \
src/external/historical/nawk/dist/parse.c \
src/external/historical/nawk/dist/ytab.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/historical/nawk/dist/README
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/dist/awk.h \
src/external/historical/nawk/dist/makefile
cvs rdiff -u -r1.4 -r1.5 src/external/historical/nawk/dist/awkgram.y \
src/external/historical/nawk/dist/proctab.c
cvs rdiff -u -r1.8 -r1.9 src/external/historical/nawk/dist/b.c
cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/dist/lex.c
cvs rdiff -u -r1.9 -r1.10 src/external/historical/nawk/dist/lib.c \
src/external/historical/nawk/dist/main.c \
src/external/historical/nawk/dist/proto.h
cvs rdiff -u -r1.10 -r1.11 src/external/historical/nawk/dist/run.c \
src/external/historical/nawk/dist/tran.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/historical/nawk/dist/ytab.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
