mikel
Tue Mar 25 21:11:05 PST 1997
Update of /cvsroot/src/share/misc
In directory netbsd1:/home/mikel/tmp

Log Message:
import 4.4BSD-Lite2 versions

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/share/misc/Makefile
U src/share/misc/operator
C src/share/misc/na.phone
U src/share/misc/mdoc.template
U src/share/misc/man.template
C src/share/misc/inter.phone
N src/share/misc/flowers
U src/share/misc/eqnchar
U src/share/misc/birthtoken
U src/share/misc/ascii
C src/share/misc/airport
C src/share/misc/zipcodes

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

	cvs checkout -jCSRG:yesterday -jCSRG src/share/misc