roberto c3ce66cde9 Merge conflicts. ...

MFC after:	1 month

2002-10-29 20:04:27 +00:00

..

check_y2k.c

…

cmd_args.c

…

jupiter.h

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

Makefile.am

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

Makefile.in

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

map_vme.c

…

ntp_config.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_control.c

Merge conflicts.

2002-10-29 20:04:27 +00:00

ntp_crypto.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_filegen.c

…

ntp_intres.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_io.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_loopfilter.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_monitor.c

…

ntp_peer.c

…

ntp_proto.c

Merge conflicts.

2002-10-29 20:04:27 +00:00

ntp_refclock.c

…

ntp_request.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_restrict.c

…

ntp_timer.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

ntp_util.c

…

ntpd.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_acts.c

…

refclock_arbiter.c

…

refclock_arc.c

…

refclock_as2201.c

…

refclock_atom.c

…

refclock_bancomm.c

…

refclock_chronolog.c

…

refclock_chu.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_conf.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_datum.c

…

refclock_dumbclock.c

…

refclock_fg.c

…

refclock_gpsvme.c

…

refclock_heath.c

…

refclock_hopfpci.c

…

refclock_hopfser.c

…

refclock_hpgps.c

…

refclock_irig.c

…

refclock_jjy.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_jupiter.c

…

refclock_leitch.c

…

refclock_local.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_msfees.c

…

refclock_mx4200.c

…

refclock_nmea.c

…

refclock_oncore.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_palisade.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_palisade.h

…

refclock_parse.c

…

refclock_pcf.c

…

refclock_pst.c

…

refclock_ptbacts.c

…

refclock_shm.c

…

refclock_tpro.c

…

refclock_trak.c

…

refclock_true.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_tt560.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00

refclock_ulink.c

…

refclock_usno.c

…

refclock_wwv.c

…

refclock_wwvb.c

…

refclock_zyfer.c

Virgin import of ntpd 4.1.1a

2002-10-29 19:58:12 +00:00