cgd
Tue Mar 21 07:23:15 EST 1995
Update of /a/cvsroot/src/games/atc
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv18427

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/atc/atc.6
U src/games/atc/BUGS
C src/games/atc/def.h
C src/games/atc/extern.c
C src/games/atc/extern.h
C src/games/atc/grammar.y
C src/games/atc/graphics.c
C src/games/atc/include.h
C src/games/atc/input.c
C src/games/atc/lex.l
C src/games/atc/list.c
C src/games/atc/log.c
C src/games/atc/main.c
C src/games/atc/Makefile
C src/games/atc/pathnames.h
C src/games/atc/struct.h
C src/games/atc/tunable.c
C src/games/atc/tunable.h
C src/games/atc/update.c
U src/games/atc/games/ATC_scores
U src/games/atc/games/crossover
U src/games/atc/games/default
U src/games/atc/games/easy
U src/games/atc/games/game_2
U src/games/atc/games/Game_List
U src/games/atc/games/Killer

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

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


cgd
Tue Mar 21 07:24:46 EST 1995
Update of /a/cvsroot/src/games/backgammon
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv18803

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/backgammon/Makefile
C src/games/backgammon/backgammon/backgammon.6
C src/games/backgammon/backgammon/extra.c
U src/games/backgammon/backgammon/main.c
C src/games/backgammon/backgammon/Makefile
C src/games/backgammon/backgammon/move.c
C src/games/backgammon/backgammon/text.c
C src/games/backgammon/backgammon/version.c
C src/games/backgammon/common_source/allow.c
C src/games/backgammon/common_source/back.h
C src/games/backgammon/common_source/backgammon.c
C src/games/backgammon/common_source/board.c
C src/games/backgammon/common_source/check.c
C src/games/backgammon/common_source/fancy.c
C src/games/backgammon/common_source/init.c
C src/games/backgammon/common_source/odds.c
C src/games/backgammon/common_source/one.c
C src/games/backgammon/common_source/save.c
C src/games/backgammon/common_source/subs.c
C src/games/backgammon/common_source/table.c
C src/games/backgammon/teachgammon/data.c
C src/games/backgammon/teachgammon/Makefile
C src/games/backgammon/teachgammon/teach.c
C src/games/backgammon/teachgammon/ttext1.c
C src/games/backgammon/teachgammon/ttext2.c
C src/games/backgammon/teachgammon/tutor.c
C src/games/backgammon/teachgammon/tutor.h

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

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


cgd
Tue Mar 21 07:26:54 EST 1995
Update of /a/cvsroot/src/games/battlestar
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv19247

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/battlestar/battlestar.6
C src/games/battlestar/battlestar.c
C src/games/battlestar/com1.c
C src/games/battlestar/com2.c
C src/games/battlestar/com3.c
C src/games/battlestar/com4.c
C src/games/battlestar/com5.c
C src/games/battlestar/com6.c
C src/games/battlestar/com7.c
C src/games/battlestar/cypher.c
C src/games/battlestar/dayfile.c
C src/games/battlestar/dayobjs.c
C src/games/battlestar/externs.h
C src/games/battlestar/fly.c
C src/games/battlestar/getcom.c
C src/games/battlestar/globals.c
C src/games/battlestar/init.c
C src/games/battlestar/Makefile
C src/games/battlestar/misc.c
C src/games/battlestar/nightfile.c
C src/games/battlestar/nightobjs.c
C src/games/battlestar/parse.c
C src/games/battlestar/pathnames.h
C src/games/battlestar/room.c
C src/games/battlestar/save.c
C src/games/battlestar/words.c

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

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


cgd
Tue Mar 21 07:27:53 EST 1995
Update of /a/cvsroot/src/games/bcd
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv19689

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/bcd/bcd.6
C src/games/bcd/bcd.c
C src/games/bcd/Makefile

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

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


cgd
Tue Mar 21 07:28:11 EST 1995
Update of /a/cvsroot/src/games/caesar
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv19757

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/caesar/caesar.6
C src/games/caesar/caesar.c
C src/games/caesar/Makefile
N src/games/caesar/rot13.sh

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

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


cgd
Tue Mar 21 07:28:41 EST 1995
Update of /a/cvsroot/src/games/canfield
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv19828

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/canfield/Makefile
C src/games/canfield/canfield/canfield.6
C src/games/canfield/canfield/canfield.c
C src/games/canfield/canfield/Makefile
C src/games/canfield/canfield/pathnames.h
C src/games/canfield/cfscores/cfscores.c
C src/games/canfield/cfscores/Makefile

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

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


cgd
Tue Mar 21 07:29:31 EST 1995
Update of /a/cvsroot/src/games/cribbage
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv19968

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/games/cribbage/cards.c
C src/games/cribbage/crib.c
C src/games/cribbage/cribbage.6
C src/games/cribbage/cribbage.h
U src/games/cribbage/cribbage.n
C src/games/cribbage/cribcur.h
C src/games/cribbage/deck.h
C src/games/cribbage/extern.c
C src/games/cribbage/instr.c
C src/games/cribbage/io.c
C src/games/cribbage/Makefile
C src/games/cribbage/pathnames.h
C src/games/cribbage/score.c
C src/games/cribbage/support.c

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

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