Date: Tue, 21 Mar 1995 11:10:16 -0500 From: The Source of All Evil <source@NetBSD.ORG> To: source-changes@pain.lcs.mit.edu Subject: sun-lamp CVS commits Message-ID: <199503211610.LAA26563@pain.lcs.mit.edu>
next in thread | raw e-mail | index | archive | help
cgd Tue Mar 21 11:00:35 EST 1995 Update of /a/cvsroot/src/games/larn In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25962 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/larn/bill.c U src/games/larn/config.c U src/games/larn/COPYRIGHT U src/games/larn/create.c U src/games/larn/data.c U src/games/larn/diag.c U src/games/larn/display.c U src/games/larn/Fixed.Bugs C src/games/larn/fortune.c U src/games/larn/global.c C src/games/larn/header.h U src/games/larn/help.c N src/games/larn/holidays U src/games/larn/io.c C src/games/larn/larn.6 U src/games/larn/main.c C src/games/larn/Makefile U src/games/larn/monster.c U src/games/larn/moreobj.c U src/games/larn/movem.c U src/games/larn/nap.c U src/games/larn/object.c U src/games/larn/OWNER U src/games/larn/pathnames.h U src/games/larn/README U src/games/larn/regen.c U src/games/larn/store.c U src/games/larn/savelev.c U src/games/larn/scores.c U src/games/larn/signal.c U src/games/larn/tok.c U src/games/larn/datfiles/larn.help U src/games/larn/datfiles/larnmaze U src/games/larn/datfiles/larnopts 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/larn cgd Tue Mar 21 11:06:20 EST 1995 Update of /a/cvsroot/src/games/monop In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26148 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 U src/games/monop/brd.dat C src/games/monop/cards.c U src/games/monop/cards.inp C src/games/monop/deck.h C src/games/monop/execute.c C src/games/monop/getinp.c C src/games/monop/houses.c C src/games/monop/initdeck.c C src/games/monop/jail.c C src/games/monop/Makefile C src/games/monop/misc.c U src/games/monop/mon.dat C src/games/monop/monop.6 C src/games/monop/monop.c C src/games/monop/monop.def U src/games/monop/monop.ext C src/games/monop/monop.h C src/games/monop/morg.c C src/games/monop/pathnames.h C src/games/monop/print.c C src/games/monop/prop.c U src/games/monop/prop.dat C src/games/monop/rent.c C src/games/monop/roll.c C src/games/monop/spec.c C src/games/monop/trade.c 21 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/monop cgd Tue Mar 21 11:06:50 EST 1995 Update of /a/cvsroot/src/games/morse In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26366 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/morse/Makefile C src/games/morse/morse.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/morse cgd Tue Mar 21 11:07:18 EST 1995 Update of /a/cvsroot/src/games/number In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26396 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/number/Makefile C src/games/number/number.6 C src/games/number/number.c 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/number cgd Tue Mar 21 11:07:45 EST 1995 Update of /a/cvsroot/src/games/pom In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26430 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/pom/Makefile C src/games/pom/pom.6 C src/games/pom/pom.c 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/pom cgd Tue Mar 21 11:08:38 EST 1995 Update of /a/cvsroot/src/games/ppt In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26466 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/ppt/Makefile C src/games/ppt/ppt.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/ppt cgd Tue Mar 21 11:09:49 EST 1995 Update of /a/cvsroot/src/games/primes In directory pain.lcs.mit.edu:/b/tmp/cvs-serv26499 Revision/Branch: 1.1.1 Log Message: from Lite Status: Vendor Tag: CSRG Release Tags: lite-1 C src/games/primes/Makefile C src/games/primes/pattern.c C src/games/primes/primes.c C src/games/primes/primes.h C src/games/primes/pr_tbl.c 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/games/primes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199503211610.LAA26563>