tls
Thu Sep 28 00:34:06 EDT 1995
Update of /a/cvsroot/src/usr.bin/m4
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/m4/stdd.h
C src/usr.bin/m4/serv.c
C src/usr.bin/m4/pathnames.h
I src/usr.bin/m4/obj
C src/usr.bin/m4/misc.c
C src/usr.bin/m4/mdef.h
C src/usr.bin/m4/main.c
C src/usr.bin/m4/look.c
C src/usr.bin/m4/extern.h
C src/usr.bin/m4/expr.c
C src/usr.bin/m4/eval.c
C src/usr.bin/m4/NOTES
I src/usr.bin/m4/tags
C src/usr.bin/m4/Makefile
C src/usr.bin/m4/TEST/ack.m4
C src/usr.bin/m4/TEST/hanoi.m4
C src/usr.bin/m4/TEST/hash.m4
C src/usr.bin/m4/TEST/sqroot.m4
C src/usr.bin/m4/TEST/string.m4
C src/usr.bin/m4/TEST/test.m4

18 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/m4