Module Name:    src
Committed By:   christos
Date:           Sat Aug 17 22:22:30 UTC 2024

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 proto.h run.c tran.c
        src/external/historical/nawk/dist/testdir: beebe.tar
Added Files:
        src/external/historical/nawk/bin/awk: Makefile TODO awk.1
        src/external/historical/nawk/bin/maketab: Makefile Makefile.maketab
Removed Files:
        src/external/historical/nawk/bin: TODO awk.1
        src/external/historical/nawk/dist: proctab.c ytab.c ytab.h
        src/external/historical/nawk/dist/testdir: xc

Log Message:
Marge conflicts between 2020-02-18 and 2024-08-17


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/historical/nawk/bin/Makefile
cvs rdiff -u -r1.1 -r0 src/external/historical/nawk/bin/TODO
cvs rdiff -u -r1.33 -r0 src/external/historical/nawk/bin/awk.1
cvs rdiff -u -r0 -r1.1 src/external/historical/nawk/bin/awk/Makefile \
    src/external/historical/nawk/bin/awk/TODO \
    src/external/historical/nawk/bin/awk/awk.1
cvs rdiff -u -r0 -r1.1 src/external/historical/nawk/bin/maketab/Makefile \
    src/external/historical/nawk/bin/maketab/Makefile.maketab
cvs rdiff -u -r1.3 -r1.4 src/external/historical/nawk/dist/FIXES \
    src/external/historical/nawk/dist/awk.1 \
    src/external/historical/nawk/dist/parse.c
cvs rdiff -u -r1.4 -r1.5 src/external/historical/nawk/dist/awk.h \
    src/external/historical/nawk/dist/makefile \
    src/external/historical/nawk/dist/maketab.c
cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/dist/awkgram.y
cvs rdiff -u -r1.9 -r1.10 src/external/historical/nawk/dist/b.c
cvs rdiff -u -r1.7 -r1.8 src/external/historical/nawk/dist/lex.c
cvs rdiff -u -r1.14 -r1.15 src/external/historical/nawk/dist/lib.c \
    src/external/historical/nawk/dist/run.c
cvs rdiff -u -r1.11 -r1.12 src/external/historical/nawk/dist/main.c
cvs rdiff -u -r1.6 -r0 src/external/historical/nawk/dist/proctab.c
cvs rdiff -u -r1.12 -r1.13 src/external/historical/nawk/dist/proto.h
cvs rdiff -u -r1.15 -r1.16 src/external/historical/nawk/dist/tran.c
cvs rdiff -u -r1.3 -r0 src/external/historical/nawk/dist/ytab.c
cvs rdiff -u -r1.2 -r0 src/external/historical/nawk/dist/ytab.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/historical/nawk/dist/testdir/beebe.tar
cvs rdiff -u -r1.1.1.1 -r0 src/external/historical/nawk/dist/testdir/xc

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

Reply via email to