jtc
Tue Oct  8 17:40:35 PDT 1996
Update of /a/cvsroot/src/etc/etc.amiga
In directory netbsd1:/home/jtc/src-current/src/etc/etc.amiga

Modified Files:
	Makefile.inc disktab 
Log Message:
merge in 1.2 branch

jtc
Tue Oct  8 17:40:36 PDT 1996
Update of /a/cvsroot/src/etc/etc.sun3
In directory netbsd1:/home/jtc/src-current/src/etc/etc.sun3

Modified Files:
	MAKEDEV ttys 
Log Message:
merge in 1.2 branch

jtc
Tue Oct  8 17:40:38 PDT 1996
Update of /a/cvsroot/src/etc/etc.x68k
In directory netbsd1:/home/jtc/src-current/src/etc/etc.x68k

Modified Files:
	MAKEDEV ttys 
Log Message:
merge in 1.2 branch

jtc
Tue Oct  8 17:45:38 PDT 1996
Update of /a/cvsroot/src/games/larn
In directory netbsd1:/home/jtc/src-current/src/games/larn

Modified Files:
	scores.c 
Log Message:
merge in 1.2 branch

thorpej
Tue Oct  8 17:49:41 PDT 1996
Update of /a/cvsroot/src/sys/compat/ultrix
In directory netbsd1:/home/jtc/src-current/src/sys/compat/ultrix

Modified Files:
	ultrix_ioctl.c 
Log Message:
Merge the netbsd-1-2 branch back into the mainline.