cgd
Tue Mar 21 10:52:30 EST 1995
Update of /a/cvsroot/src/games/fortune
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25198

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/fortune/Makefile
U src/games/fortune/Notes
U src/games/fortune/README
U src/games/fortune/datfiles/fortunes
U src/games/fortune/datfiles/fortunes-o.sp.ok
N src/games/fortune/datfiles/fortunes2
N src/games/fortune/datfiles/fortunes2-o
N src/games/fortune/datfiles/fortunes-o.fake
C src/games/fortune/datfiles/fortunes-o.real
U src/games/fortune/datfiles/fortunes.sp.ok
N src/games/fortune/datfiles/limerick
C src/games/fortune/datfiles/Makefile
U src/games/fortune/datfiles/startrek
U src/games/fortune/datfiles/startrek.sp.ok
U src/games/fortune/datfiles/zippy
U src/games/fortune/datfiles/zippy.sp.ok
C src/games/fortune/fortune/fortune.6
C src/games/fortune/fortune/fortune.c
C src/games/fortune/fortune/Makefile
C src/games/fortune/fortune/pathnames.h
C src/games/fortune/strfile/Makefile
C src/games/fortune/strfile/strfile.8
C src/games/fortune/strfile/strfile.c
C src/games/fortune/strfile/strfile.h
N src/games/fortune/tools/do_sort
U src/games/fortune/tools/Do_spell
U src/games/fortune/tools/Do_troff
U src/games/fortune/tools/Troff.mac
U src/games/fortune/tools/Troff.sed
C src/games/fortune/unstr/Makefile
C src/games/fortune/unstr/unstr.c

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

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


cgd
Tue Mar 21 10:57:26 EST 1995
Update of /a/cvsroot/src/games/hack
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25424

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
U src/games/hack/alloc.c
U src/games/hack/config.h
U src/games/hack/COPYRIGHT
U src/games/hack/data
U src/games/hack/date.h
U src/games/hack/def.objects.h
U src/games/hack/def.objclass.h
U src/games/hack/def.edog.h
U src/games/hack/def.eshk.h
U src/games/hack/def.flag.h
U src/games/hack/def.func_tab.h
U src/games/hack/def.gen.h
U src/games/hack/def.gold.h
U src/games/hack/def.mkroom.h
U src/games/hack/def.monst.h
U src/games/hack/def.obj.h
U src/games/hack/def.permonst.h
U src/games/hack/def.rm.h
U src/games/hack/def.trap.h
U src/games/hack/def.wseg.h
U src/games/hack/hack.worn.c
U src/games/hack/hack.trap.c
U src/games/hack/hack.shknam.c
C src/games/hack/hack.6
U src/games/hack/hack.monst.c
U src/games/hack/hack.do_wear.c
C src/games/hack/hack.apply.c
U src/games/hack/hack.bones.c
U src/games/hack/hack.c
U src/games/hack/hack.cmd.c
U src/games/hack/hack.Decl.c
U src/games/hack/hack.do.c
U src/games/hack/hack.dog.c
U src/games/hack/hack.do_name.c
U src/games/hack/hack.eat.c
U src/games/hack/hack.end.c
U src/games/hack/hack.engrave.c
U src/games/hack/hack.fight.c
U src/games/hack/hack.fix
U src/games/hack/hack.h
C src/games/hack/hack.invent.c
U src/games/hack/hack.ioctl.c
U src/games/hack/hack.lev.c
U src/games/hack/hack.main.c
U src/games/hack/hack.makemon.c
U src/games/hack/hack.mfndpos.h
U src/games/hack/hh
U src/games/hack/hack.mhitu.c
U src/games/hack/hack.mklev.c
U src/games/hack/hack.mkmaze.c
U src/games/hack/hack.mkobj.c
C src/games/hack/hack.mkshop.c
U src/games/hack/hack.mon.c
U src/games/hack/hack.objnam.c
U src/games/hack/hack.onames.h
U src/games/hack/hack.options.c
U src/games/hack/hack.o_init.c
U src/games/hack/hack.pager.c
U src/games/hack/hack.potion.c
U src/games/hack/hack.pri.c
U src/games/hack/hack.read.c
U src/games/hack/hack.rip.c
U src/games/hack/hack.rumors.c
C src/games/hack/hack.save.c
U src/games/hack/hack.search.c
U src/games/hack/hack.sh
U src/games/hack/hack.shk.c
U src/games/hack/hack.steal.c
U src/games/hack/hack.termcap.c
U src/games/hack/help
U src/games/hack/hack.timeout.c
U src/games/hack/hack.topl.c
U src/games/hack/hack.track.c
C src/games/hack/hack.tty.c
U src/games/hack/hack.unix.c
U src/games/hack/hack.u_init.c
U src/games/hack/hack.vault.c
U src/games/hack/hack.version.c
U src/games/hack/hack.wield.c
U src/games/hack/hack.wizard.c
U src/games/hack/hack.worm.c
U src/games/hack/hack.zap.c
U src/games/hack/makedefs.c
C src/games/hack/Makefile
U src/games/hack/Makequest
U src/games/hack/Original_READ_ME
U src/games/hack/OWNER
C src/games/hack/pathnames.h
U src/games/hack/READ_ME
U src/games/hack/rnd.c
U src/games/hack/rumors

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

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


cgd
Tue Mar 21 10:58:58 EST 1995
Update of /a/cvsroot/src/games/hangman
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25847

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/hangman/endgame.c
C src/games/hangman/extern.c
C src/games/hangman/getguess.c
C src/games/hangman/getword.c
C src/games/hangman/hangman.6
C src/games/hangman/hangman.h
C src/games/hangman/main.c
C src/games/hangman/Makefile
C src/games/hangman/pathnames.h
C src/games/hangman/playgame.c
C src/games/hangman/prdata.c
C src/games/hangman/prman.c
C src/games/hangman/prword.c
C src/games/hangman/setup.c

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

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