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/06/1994 16:40:02
jtc
Tue Dec  6 16:33:51 PST 1994
Update of /b/source/CVS/src/usr.bin/unifdef
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/unifdef

Modified Files:
	Makefile unifdef.1 unifdef.c 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS ID convention.


jtc
Tue Dec  6 16:34:44 PST 1994
Update of /b/source/CVS/src/usr.bin/unexpand
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

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

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

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


jtc
Tue Dec  6 16:36:43 PST 1994
Update of /b/source/CVS/src/usr.bin/unexpand
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/unexpand

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