Module Name:	src
Committed By:	jdolecek
Date:		Sat Jul  2 20:10:34 UTC 2005

Modified Files:
	src/dist/nawk: README awk.h b.c lex.c lib.c main.c run.c tran.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/dist/nawk/README
cvs rdiff -r1.4 -r1.5 src/dist/nawk/awk.h src/dist/nawk/main.c \
    src/dist/nawk/tran.c
cvs rdiff -r1.5 -r1.6 src/dist/nawk/b.c
cvs rdiff -r1.6 -r1.7 src/dist/nawk/lex.c src/dist/nawk/lib.c
cvs rdiff -r1.10 -r1.11 src/dist/nawk/run.c

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