mrg
Sat Oct 18 08:45:47 PDT 1997
Update of /cvsroot/src/usr.bin/indent
In directory netbsd1:/home/mrg/lite2/usr.bin/indent

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/indent/indent.1
C src/usr.bin/indent/args.c
C src/usr.bin/indent/Makefile
C src/usr.bin/indent/indent.c
C src/usr.bin/indent/indent_codes.h
C src/usr.bin/indent/indent_globs.h
C src/usr.bin/indent/io.c
C src/usr.bin/indent/lexi.c
C src/usr.bin/indent/parse.c
C src/usr.bin/indent/pr_comment.c
C src/usr.bin/indent/README
I src/usr.bin/indent/.#cvsxxx

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

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


matt
Sat Oct 18 08:48:52 PDT 1997
Update of /cvsroot/src/usr.bin/mail
In directory netbsd1:/var/slash-tmp/cvs-serv24187

Modified Files:
	fio.c 
Log Message:
Allow mailboxes to be in <cr><lf> format.