christos
Fri Mar  6 11:33:11 EST 1998
Update of /cvsroot/src/usr.sbin/xntp
In directory nb00:/tmp/cvs-serv22581

Log Message:
Import xntp 3-5-92

Status:

Vendor Tag:	UDEL
Release Tags:	xntp-3-5-92
		
C src/usr.sbin/xntp/COPYRIGHT
C src/usr.sbin/xntp/Makefile
C src/usr.sbin/xntp/Makefile.inc
C src/usr.sbin/xntp/include/l_stdlib.h
C src/usr.sbin/xntp/include/ntp.h
C src/usr.sbin/xntp/include/ntp_calendar.h
U src/usr.sbin/xntp/include/ntp_control.h
U src/usr.sbin/xntp/include/ntp_filegen.h
U src/usr.sbin/xntp/include/ntp_fp.h
U src/usr.sbin/xntp/include/ntp_if.h
U src/usr.sbin/xntp/include/ntp_io.h
C src/usr.sbin/xntp/include/ntp_machine.h
U src/usr.sbin/xntp/include/ntp_malloc.h
N src/usr.sbin/xntp/include/ntp_proto.h
C src/usr.sbin/xntp/include/ntp_refclock.h
U src/usr.sbin/xntp/include/ntp_request.h
C src/usr.sbin/xntp/include/ntp_select.h
C src/usr.sbin/xntp/include/ntp_stdlib.h
U src/usr.sbin/xntp/include/ntp_string.h
C src/usr.sbin/xntp/include/ntp_syslog.h
C src/usr.sbin/xntp/include/ntp_types.h
U src/usr.sbin/xntp/include/ntp_unixtime.h
C src/usr.sbin/xntp/include/ntpd.h
C src/usr.sbin/xntp/include/parse.h
C src/usr.sbin/xntp/include/config.h
C src/usr.sbin/xntp/include/parse_conf.h
C src/usr.sbin/xntp/ntpdate/ntpdate.c
U src/usr.sbin/xntp/ntpdate/ntpdate.h
C src/usr.sbin/xntp/ntpdate/Makefile
C src/usr.sbin/xntp/ntpdate/ntpdate.8
C src/usr.sbin/xntp/ntptime/ntptime.c
C src/usr.sbin/xntp/ntptime/Makefile
C src/usr.sbin/xntp/ntptime/ntptime.8
C src/usr.sbin/xntp/ntpq/ntpq.c
C src/usr.sbin/xntp/ntpq/ntpq.h
C src/usr.sbin/xntp/ntpq/ntpq_ops.c
C src/usr.sbin/xntp/ntpq/Makefile
C src/usr.sbin/xntp/ntpq/ntpq.8
C src/usr.sbin/xntp/ntptrace/ntptrace.c
U src/usr.sbin/xntp/ntptrace/ntptrace.h
C src/usr.sbin/xntp/ntptrace/Makefile
C src/usr.sbin/xntp/ntptrace/ntptrace.8
U src/usr.sbin/xntp/xntpd/map_vme.c
C src/usr.sbin/xntp/xntpd/ntp_config.c
C src/usr.sbin/xntp/xntpd/ntp_control.c
C src/usr.sbin/xntp/xntpd/ntp_filegen.c
C src/usr.sbin/xntp/xntpd/ntp_intres.c
C src/usr.sbin/xntp/xntpd/ntp_io.c
U src/usr.sbin/xntp/xntpd/ntp_leap.c
C src/usr.sbin/xntp/xntpd/ntp_loopfilter.c
U src/usr.sbin/xntp/xntpd/ntp_monitor.c
C src/usr.sbin/xntp/xntpd/ntp_peer.c
C src/usr.sbin/xntp/xntpd/ntp_proto.c
C src/usr.sbin/xntp/xntpd/ntp_refclock.c
C src/usr.sbin/xntp/xntpd/ntp_request.c
U src/usr.sbin/xntp/xntpd/ntp_restrict.c
C src/usr.sbin/xntp/xntpd/ntp_timer.c
C src/usr.sbin/xntp/xntpd/ntp_unixclock.c
C src/usr.sbin/xntp/xntpd/ntp_util.c
C src/usr.sbin/xntp/xntpd/ntpd.c
C src/usr.sbin/xntp/xntpd/refclock_acts.c
C src/usr.sbin/xntp/xntpd/refclock_arbiter.c
N src/usr.sbin/xntp/xntpd/refclock_arc.c
C src/usr.sbin/xntp/xntpd/refclock_as2201.c
C src/usr.sbin/xntp/xntpd/refclock_atom.c
C src/usr.sbin/xntp/xntpd/refclock_bancomm.c
C src/usr.sbin/xntp/xntpd/refclock_chu.c
C src/usr.sbin/xntp/xntpd/refclock_conf.c
U src/usr.sbin/xntp/xntpd/refclock_datum.c
C src/usr.sbin/xntp/xntpd/refclock_gpsvme.c
C src/usr.sbin/xntp/xntpd/refclock_heath.c
C src/usr.sbin/xntp/xntpd/refclock_hpgps.c
C src/usr.sbin/xntp/xntpd/refclock_irig.c
C src/usr.sbin/xntp/xntpd/refclock_leitch.c
U src/usr.sbin/xntp/xntpd/refclock_local.c
C src/usr.sbin/xntp/xntpd/refclock_msfees.c
C src/usr.sbin/xntp/xntpd/refclock_mx4200.c
C src/usr.sbin/xntp/xntpd/refclock_nmea.c
C src/usr.sbin/xntp/xntpd/refclock_parse.c
C src/usr.sbin/xntp/xntpd/refclock_pst.c
U src/usr.sbin/xntp/xntpd/refclock_ptbacts.c
C src/usr.sbin/xntp/xntpd/refclock_tpro.c
C src/usr.sbin/xntp/xntpd/refclock_trak.c
C src/usr.sbin/xntp/xntpd/refclock_true.c
C src/usr.sbin/xntp/xntpd/refclock_usno.c
C src/usr.sbin/xntp/xntpd/refclock_wwvb.c
C src/usr.sbin/xntp/xntpd/parse.c
C src/usr.sbin/xntp/xntpd/parse_conf.c
C src/usr.sbin/xntp/xntpd/clk_computime.c
C src/usr.sbin/xntp/xntpd/clk_dcf7000.c
C src/usr.sbin/xntp/xntpd/clk_hopf6021.c
C src/usr.sbin/xntp/xntpd/clk_meinberg.c
C src/usr.sbin/xntp/xntpd/clk_rawdcf.c
C src/usr.sbin/xntp/xntpd/clk_rcc8000.c
C src/usr.sbin/xntp/xntpd/clk_schmid.c
C src/usr.sbin/xntp/xntpd/clk_trimtaip.c
C src/usr.sbin/xntp/xntpd/clk_trimtsip.c
C src/usr.sbin/xntp/xntpd/Makefile
C src/usr.sbin/xntp/xntpd/xntpd.8
C src/usr.sbin/xntp/xntpdc/ntpdc.c
C src/usr.sbin/xntp/xntpdc/ntpdc.h
C src/usr.sbin/xntp/xntpdc/ntpdc_ops.c
C src/usr.sbin/xntp/xntpdc/Makefile
C src/usr.sbin/xntp/xntpdc/xntpdc.8

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

	cvs checkout -jUDEL:yesterday -jUDEL src/usr.sbin/xntp