sun-lamp CVS commits

[The Source of All Evil <source>]

mycroft
Tue Mar 21 10:40:21 EST 1995
Update of /a/cvsroot/src/bin/sh
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25058

Modified Files:
        error.c 
Log Message:
Use sigprocmask(), not sigsetmask().

cgd
Tue Mar 21 10:46:41 EST 1995
Update of /a/cvsroot/src/games/factor
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25117

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

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

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

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


cgd
Tue Mar 21 10:47:01 EST 1995
Update of /a/cvsroot/src/games/fish
In directory pain.lcs.mit.edu:/b/tmp/cvs-serv25152

Revision/Branch: 1.1.1

Log Message:
from Lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/games/fish/fish.6
C src/games/fish/fish.c
U src/games/fish/fish.instr
C src/games/fish/Makefile
C src/games/fish/pathnames.h

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

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