pk
Sat Apr 22 06:00:56 EDT 1995
Update of /a/cvsroot/src/sys/arch/sparc/sparc
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv1979

Modified Files:
	machdep.c 
Log Message:
Use vfs_shutdown().


cgd
Sat Apr 22 06:01:36 EDT 1995
Update of /a/cvsroot/src/games/robots
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv2046

Revision/Branch: 1.1.1

Log Message:
src/games/robots from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	Lite-1
		
C src/games/robots/extern.c
C src/games/robots/flush_in.c
C src/games/robots/init_field.c
C src/games/robots/main.c
C src/games/robots/Makefile
C src/games/robots/make_level.c
C src/games/robots/move.c
C src/games/robots/move_robs.c
C src/games/robots/pathnames.h
C src/games/robots/play_level.c
C src/games/robots/query.c
C src/games/robots/rnd_pos.c
C src/games/robots/robots.6
C src/games/robots/robots.h
C src/games/robots/score.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/games/robots


cgd
Sat Apr 22 06:09:15 EDT 1995
Update of /a/cvsroot/src/games/robots
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv2463

Modified Files:
	Makefile extern.c flush_in.c init_field.c main.c make_level.c 
	move.c move_robs.c pathnames.h play_level.c query.c rnd_pos.c 
	robots.6 robots.h score.c 
Log Message:
clean up import