Subject: sun-lamp CVS commits
To: None <source-changes@sun-lamp.cs.berkeley.edu>
From: The Source Master <srcmastr@NetBSD.ORG>
List: source-changes
Date: 12/21/1994 00:50:03
jtc
Wed Dec 21 00:42:05 PST 1994
Update of /b/source/CVS/src/usr.bin/shar
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/shar

Modified Files:
	Makefile shar.1 shar.sh 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.


jtc
Wed Dec 21 00:45:19 PST 1994
Update of /b/source/CVS/src/usr.bin/showmount
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/showmount/Makefile
C src/usr.bin/showmount/showmount.8
C src/usr.bin/showmount/showmount.c
I src/usr.bin/showmount/tags

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

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


jtc
Wed Dec 21 00:48:12 PST 1994
Update of /b/source/CVS/src/usr.bin/showmount
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/showmount

Modified Files:
	Makefile showmount.8 showmount.c 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.