mark
Fri Oct 17 00:00:37 PDT 1997
Update of /cvsroot/src/sys/arch/arm32/conf
In directory netbsd1:/var/slash-tmp/cvs-serv19915

Modified Files:
	files.arm32 
Log Message:
Updated for the new wd.c and wdc.c files in arm32/dev/


mrg
Fri Oct 17 00:00:40 PDT 1997
Update of /cvsroot/src/usr.sbin/rwhod
In directory netbsd1:/home/mrg/lite2/rwhod

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.sbin/rwhod/rwhod.8
U src/usr.sbin/rwhod/rwhod.c
C src/usr.sbin/rwhod/Makefile

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/rwhod


mrg
Fri Oct 17 00:01:48 PDT 1997
Update of /cvsroot/src/usr.sbin/sliplogin
In directory netbsd1:/home/mrg/lite2/sliplogin

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/sliplogin/pathnames.h
C src/usr.sbin/sliplogin/sliplogin.8
C src/usr.sbin/sliplogin/Makefile
C src/usr.sbin/sliplogin/sliplogin.c
C src/usr.sbin/sliplogin/slip.login
C src/usr.sbin/sliplogin/slip.hosts

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/sliplogin


mrg
Fri Oct 17 00:03:39 PDT 1997
Update of /cvsroot/src/usr.sbin/syslogd
In directory netbsd1:/home/mrg/lite2/syslogd

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.sbin/syslogd/Makefile
U src/usr.sbin/syslogd/pathnames.h
U src/usr.sbin/syslogd/syslogd.c
U src/usr.sbin/syslogd/syslogd.8
U src/usr.sbin/syslogd/syslog.conf.5

No conflicts created by this import


mrg
Fri Oct 17 00:05:06 PDT 1997
Update of /cvsroot/src/usr.sbin/timed
In directory netbsd1:/home/mrg/lite2/timed

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/timed/Makefile
C src/usr.sbin/timed/timed/Makefile
C src/usr.sbin/timed/timed/acksend.c
C src/usr.sbin/timed/timed/byteorder.c
C src/usr.sbin/timed/timed/candidate.c
cvs: ERROR: Check-in of /cvsroot/src/usr.sbin/timed/timed/cksum.c,v failed
C src/usr.sbin/timed/timed/correct.c
C src/usr.sbin/timed/timed/globals.h
C src/usr.sbin/timed/timed/master.c
C src/usr.sbin/timed/timed/measure.c
C src/usr.sbin/timed/timed/networkdelta.c
C src/usr.sbin/timed/timed/pathnames.h
C src/usr.sbin/timed/timed/readmsg.c
C src/usr.sbin/timed/timed/slave.c
C src/usr.sbin/timed/timed/timed.8
C src/usr.sbin/timed/timed/timed.c
N src/usr.sbin/timed/timed/extern.h
N src/usr.sbin/timed/timed/CHANGES
C src/usr.sbin/timed/timedc/Makefile
C src/usr.sbin/timed/timedc/cmds.c
C src/usr.sbin/timed/timedc/cmdtab.c
C src/usr.sbin/timed/timedc/timedc.8
C src/usr.sbin/timed/timedc/timedc.c
C src/usr.sbin/timed/timedc/timedc.h
N src/usr.sbin/timed/timedc/extern.h
N src/usr.sbin/timed/SMM.doc/timedop/Makefile
N src/usr.sbin/timed/SMM.doc/timedop/timed.ms
N src/usr.sbin/timed/SMM.doc/timed/Makefile
N src/usr.sbin/timed/SMM.doc/timed/date
N src/usr.sbin/timed/SMM.doc/timed/loop
N src/usr.sbin/timed/SMM.doc/timed/time
N src/usr.sbin/timed/SMM.doc/timed/timed.ms
N src/usr.sbin/timed/SMM.doc/timed/unused
N src/usr.sbin/timed/SMM.doc/timed/spell.ok

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/timed


lukem
Fri Oct 17 00:06:08 PDT 1997
Update of /cvsroot/src/usr.sbin/hilinfo
In directory netbsd1:/var/slash-tmp/cvs-serv21001

Modified Files:
	hilinfo.c 
Log Message:
WARNSify, rcsid police

mrg
Fri Oct 17 00:06:41 PDT 1997
Update of /cvsroot/src/usr.sbin/timed/timed
In directory netbsd1:/home/mrg/lite2/timed/timed

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.sbin/timed/timed/cksum.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/timed/timed


enami
Fri Oct 17 00:07:35 PDT 1997
Update of /cvsroot/src/sys/arch/i386/conf
In directory netbsd1:/var/slash-tmp/cvs-serv21061

Modified Files:
	GENERIC INSTALL DISKLESS 
Log Message:
Use TAB to separate `cd*' and `at'.


mikel
Fri Oct 17 00:08:08 PDT 1997
Update of /cvsroot/src/usr.bin/whatis
In directory netbsd1:/var/slash-tmp/cvs-serv20981

Modified Files:
	whatis.c 
Log Message:
cleanup for WARNS=1; also avoid feeding relative pathnames to
  #include, and avoid using array contents out of scope.


mikel
Fri Oct 17 00:08:54 PDT 1997
Update of /cvsroot/src/usr.bin/whatis
In directory netbsd1:/var/slash-tmp/cvs-serv21310

Modified Files:
	Makefile 
Log Message:
now needs -I to find headers from ../man

enami
Fri Oct 17 00:08:56 PDT 1997
Update of /cvsroot/src/sys/arch/i386/conf
In directory netbsd1:/var/slash-tmp/cvs-serv21290

Modified Files:
	GENERIC 
Log Message:
Use lowercase for hexdigit.


mrg
Fri Oct 17 00:10:00 PDT 1997
Update of /cvsroot/src/usr.sbin/vipw
In directory netbsd1:/home/mrg/lite2/vipw

Log Message:
4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.sbin/vipw/vipw.c
U src/usr.sbin/vipw/vipw.8
C src/usr.sbin/vipw/pw_util.c
U src/usr.sbin/vipw/Makefile
U src/usr.sbin/vipw/pw_util.h

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin/vipw