Subject: sun-lamp CVS commits
To: None <source-changes@pain.lcs.mit.edu>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 08/31/1995 19:40:01
jtc
Thu Aug 31 19:30:59 EDT 1995
Update of /a/cvsroot/src/usr.bin/nice
In directory pain.lcs.mit.edu:/a/users/jtc/nice

Modified Files:
	Makefile nice.1 nice.c 
Log Message:
Sync with 4.4lite2
I actually threw away most of the changes, because our version of this
program is considerably better.


jtc
Thu Aug 31 19:31:29 EDT 1995
Update of /a/cvsroot/src/usr.bin/nohup
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

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

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

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


jtc
Thu Aug 31 19:35:26 EDT 1995
Update of /a/cvsroot/src/usr.bin/nohup
In directory pain.lcs.mit.edu:/a/users/jtc/nohup

Modified Files:
	Makefile nohup.1 nohup.c 
Log Message:
Sync with 4.4lite2.


jtc
Thu Aug 31 19:36:09 EDT 1995
Update of /a/cvsroot/src/usr.bin/pagesize
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
I src/usr.bin/pagesize/tags
N src/usr.bin/pagesize/pagesize.sh
C src/usr.bin/pagesize/pagesize.1
I src/usr.bin/pagesize/obj
C src/usr.bin/pagesize/Makefile

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

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


jtc
Thu Aug 31 19:38:52 EDT 1995
Update of /a/cvsroot/src/usr.bin/pagesize
In directory pain.lcs.mit.edu:/a/users/jtc/pagesize

Modified Files:
	Makefile pagesize.1 
Removed Files:
	pagesize.c 
Log Message:
Sync with 4.4lite2

jtc
Thu Aug 31 19:39:24 EDT 1995
Update of /a/cvsroot/src/usr.bin/nm
In directory pain.lcs.mit.edu:/a/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

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

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

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