mrg
Fri Oct 17 02:10:11 PDT 1997
Update of /cvsroot/src/share/tabset
In directory netbsd1:/home/mrg/share/tabset

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/share/tabset/Makefile
U src/share/tabset/hp700-wy
U src/share/tabset/9837
U src/share/tabset/3101
U src/share/tabset/aa
U src/share/tabset/aed512
U src/share/tabset/beehive
U src/share/tabset/diablo
U src/share/tabset/dtc382
U src/share/tabset/ibm3101
U src/share/tabset/std
U src/share/tabset/stdcrt
U src/share/tabset/tandem653
U src/share/tabset/teleray
cvs: ERROR: Check-in of /cvsroot/src/share/tabset/vt100,v failed
U src/share/tabset/wyse-adds
U src/share/tabset/xerox1720
U src/share/tabset/xerox1730
U src/share/tabset/xerox1730-lm
U src/share/tabset/zenith29
N src/share/tabset/vt100-w

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

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


mrg
Fri Oct 17 02:10:54 PDT 1997
Update of /cvsroot/src/share/tabset
In directory netbsd1:/home/mrg/share/tabset

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/share/tabset/vt100

No conflicts created by this import


mrg
Fri Oct 17 02:13:06 PDT 1997
Update of /cvsroot/src/share/skel
In directory netbsd1:/home/mrg/share/skel

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/share/skel/Makefile
C src/share/skel/dot.cshrc
U src/share/skel/dot.profile
U src/share/skel/dot.login
U src/share/skel/dot.mailrc
U src/share/skel/dot.rhosts

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

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


mrg
Fri Oct 17 02:17:45 PDT 1997
Update of /cvsroot/src/share/tabset
In directory netbsd1:/var/slash-tmp/cvs-serv15293

Modified Files:
	Makefile 
Log Message:
merge lite-2