Subject: sun-lamp CVS commits
To: None <source-changes>
From: The Source Master <srcmastr>
List: source-changes
Date: 06/22/1994 03:40:02
pk
Wed Jun 22 03:35:09 PDT 1994
Update of /b/source/CVS/src/usr.sbin/config.new
In directory sun-lamp.cs.berkeley.edu:/d/users/pk/tmp/config.new

Revision/Branch: 1.1.1

Log Message:
Update to 4.4-lite.

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.sbin/config.new/config.h
C src/usr.sbin/config.new/files.c
C src/usr.sbin/config.new/gram.y
C src/usr.sbin/config.new/hash.c
C src/usr.sbin/config.new/main.c
C src/usr.sbin/config.new/mkheaders.c
C src/usr.sbin/config.new/mkioconf.c
C src/usr.sbin/config.new/mkmakefile.c
C src/usr.sbin/config.new/mkswap.c
C src/usr.sbin/config.new/pack.c
C src/usr.sbin/config.new/scan.l
C src/usr.sbin/config.new/sem.c
C src/usr.sbin/config.new/sem.h
C src/usr.sbin/config.new/util.c
C src/usr.sbin/config.new/Makefile
C src/usr.sbin/config.new/config.new.8

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/config.new


------------------------------------------------------------------------------