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

Revision/Branch: 1.1.1

Log Message:
src/games/rogue from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	Lite-1
		
U src/games/rogue/CHANGES
C src/games/rogue/curses.c
C src/games/rogue/hit.c
C src/games/rogue/init.c
C src/games/rogue/inventory.c
C src/games/rogue/level.c
C src/games/rogue/machdep.c
C src/games/rogue/main.c
C src/games/rogue/Makefile
C src/games/rogue/message.c
C src/games/rogue/monster.c
C src/games/rogue/move.c
C src/games/rogue/object.c
C src/games/rogue/pack.c
C src/games/rogue/pathnames.h
C src/games/rogue/play.c
C src/games/rogue/random.c
C src/games/rogue/ring.c
C src/games/rogue/rogue.6
C src/games/rogue/rogue.h
C src/games/rogue/room.c
C src/games/rogue/save.c
C src/games/rogue/score.c
C src/games/rogue/spec_hit.c
C src/games/rogue/throw.c
C src/games/rogue/trap.c
C src/games/rogue/use.c
C src/games/rogue/zap.c
N src/games/rogue/USD.doc/Makefile
N src/games/rogue/USD.doc/rogue.me

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

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


cgd
Sat Apr 22 06:26:11 EDT 1995
Update of /a/cvsroot/src/games/rain
In directory pain.lcs.mit.edu:/a/users/cgd/src/games/rain

Modified Files:
	rain.c 
Log Message:
clean up fputchar types (again)

cgd
Sat Apr 22 06:28:45 EDT 1995
Update of /a/cvsroot/src/games/rogue
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv3847

Modified Files:
	CHANGES Makefile curses.c hit.c init.c inventory.c level.c 
	machdep.c main.c message.c monster.c move.c object.c pack.c 
	pathnames.h play.c random.c ring.c rogue.6 rogue.h room.c 
	save.c score.c spec_hit.c throw.c trap.c use.c zap.c 
Log Message:
clean up import, NetBSD RCS Ids

cgd
Sat Apr 22 06:28:53 EDT 1995
Update of /a/cvsroot/src/games/rogue/USD.doc
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv3847/USD.doc

Modified Files:
	Makefile rogue.me 
Log Message:
clean up import, NetBSD RCS Ids

cgd
Sat Apr 22 06:29:20 EDT 1995
Update of /a/cvsroot/src/games/sail
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv4097

Revision/Branch: 1.1.1

Log Message:
src/games/sail from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	Lite-1
		
U src/games/sail/:file
U src/games/sail/:scene
U src/games/sail/:ship
U src/games/sail/:specs
C src/games/sail/assorted.c
C src/games/sail/driver.h
C src/games/sail/dr_1.c
C src/games/sail/dr_2.c
C src/games/sail/dr_3.c
C src/games/sail/dr_4.c
C src/games/sail/dr_5.c
C src/games/sail/dr_main.c
C src/games/sail/externs.h
C src/games/sail/game.c
C src/games/sail/globals.c
C src/games/sail/lo_main.c
C src/games/sail/machdep.h
C src/games/sail/main.c
C src/games/sail/Makefile
C src/games/sail/misc.c
C src/games/sail/parties.c
C src/games/sail/pathnames.h
C src/games/sail/player.h
C src/games/sail/pl_1.c
C src/games/sail/pl_2.c
C src/games/sail/pl_3.c
C src/games/sail/pl_4.c
C src/games/sail/pl_5.c
C src/games/sail/pl_6.c
C src/games/sail/pl_7.c
C src/games/sail/pl_main.c
C src/games/sail/sail.6
C src/games/sail/sync.c
C src/games/sail/version.c

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

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