briggs
Tue Apr 22 06:45:40 PDT 1997
Update of /cvsroot/src/sys/arch/mac68k/dev
In directory netbsd1:/var/slash-tmp/cvs-serv21954

Modified Files:
	if_sn_nubus.c 
Log Message:
Make sure that we unmap the space that we mapped if we can't identify the card.

mrg
Tue Apr 22 06:45:58 PDT 1997
Update of /cvsroot/src/usr.bin/less
In directory netbsd1:/var/slash-tmp/cvs-serv21798

Log Message:
import of less 321

Status:

Vendor Tag:	NUDELMAN
Release Tags:	less-321
		
U src/usr.bin/less/less/INSTALL
U src/usr.bin/less/less/README
U src/usr.bin/less/less/ch.c
U src/usr.bin/less/less/cmdbuf.c
U src/usr.bin/less/less/defines.h
U src/usr.bin/less/less/filename.c
U src/usr.bin/less/less/help.c
U src/usr.bin/less/less/jump.c
U src/usr.bin/less/less/line.c
C src/usr.bin/less/less/main.c
U src/usr.bin/less/less/optfunc.c
U src/usr.bin/less/less/opttbl.c
C src/usr.bin/less/less/prompt.c
C src/usr.bin/less/less/screen.c
U src/usr.bin/less/less/tags.c
C src/usr.bin/less/less/Makefile
U src/usr.bin/less/less/acconfig.h
U src/usr.bin/less/less/charset.c
C src/usr.bin/less/less/command.c
U src/usr.bin/less/less/forwback.c
U src/usr.bin/less/less/ifile.c
U src/usr.bin/less/less/linenum.c
U src/usr.bin/less/less/mark.c
U src/usr.bin/less/less/option.c
U src/usr.bin/less/less/os.c
U src/usr.bin/less/less/position.c
U src/usr.bin/less/less/regexp.c
U src/usr.bin/less/less/search.c
U src/usr.bin/less/less/ttyin.c
U src/usr.bin/less/less/NEWS
U src/usr.bin/less/less/brac.c
U src/usr.bin/less/less/cmd.h
U src/usr.bin/less/less/decode.c
U src/usr.bin/less/less/edit.c
U src/usr.bin/less/less/funcs.h
U src/usr.bin/less/less/input.c
U src/usr.bin/less/less/less.h
U src/usr.bin/less/less/lsystem.c
U src/usr.bin/less/less/option.h
U src/usr.bin/less/less/output.c
U src/usr.bin/less/less/position.h
U src/usr.bin/less/less/regexp.h
U src/usr.bin/less/less/signal.c
U src/usr.bin/less/less/version.c
C src/usr.bin/less/less/less.1
U src/usr.bin/less/lesskey/lesskey.c
U src/usr.bin/less/lesskey/lesskey.h
U src/usr.bin/less/lesskey/lesskey.1

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

	cvs checkout -jNUDELMAN:yesterday -jNUDELMAN src/usr.bin/less