phil
Tue Jul  1 19:40:23 PDT 1997
Update of /cvsroot/src/share/tmac
In directory netbsd1:/var/slash-tmp/cvs-serv26816

Log Message:
Update to Lite-2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/share/tmac/doc
C src/share/tmac/doc-common
N src/share/tmac/strip.sed
C src/share/tmac/doc-ditroff
C src/share/tmac/README
C src/share/tmac/doc-nroff
C src/share/tmac/doc-syms
C src/share/tmac/Makefile
C src/share/tmac/tmac.andoc
N src/share/tmac/tmac.sU
N src/share/tmac/tmac.s
N src/share/tmac/tmac.e

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

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


cjs
Tue Jul  1 19:44:15 PDT 1997
Update of /a/cvsroot/src/sys/arch/i386/conf
In directory netbsd1:/var/slash-tmp/cvs-serv27579

Modified Files:
	DISKLESS GENERIC HOMEWORLD INSTALL WARPED 
Log Message:
Update comments to show that ed driver on PCI works with 3c90x cards.