CVS commit: src/usr.bin/m4

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

Module Name:    src
Committed By:   christos
Date:           Mon Oct 26 21:11:29 UTC 2009

Modified Files:
        src/usr.bin/m4: Makefile eval.c expr.c extern.h gnum4.c look.c m4.1
            main.c mdef.h misc.c parser.y tokenizer.l trace.c

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/m4/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/m4/eval.c src/usr.bin/m4/m4.1
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/m4/expr.c src/usr.bin/m4/misc.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/m4/extern.h src/usr.bin/m4/mdef.h
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/m4/gnum4.c src/usr.bin/m4/trace.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/m4/look.c
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/m4/main.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/usr.bin/m4/parser.y \
    src/usr.bin/m4/tokenizer.l

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