From ad0bca971a9d806fee6a0bacb8f3a55b3e2a6ec0 Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 4 Nov 2002 19:38:46 +0000 Subject: Merge conflicts. MFC after: 1 month --- contrib/ntp/ntpd/ntp_control.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contrib/ntp/ntpd/ntp_control.c') diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index af667b5..1d428a2 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -403,6 +403,8 @@ static u_char clocktypes[] = { CTL_SST_TS_LF, /* REFCLK_JJY (40) */ CTL_SST_TS_UHF, /* REFCLK_TT560 (41) */ CTL_SST_TS_UHF, /* REFCLK_ZYFER (42) */ + CTL_SST_TS_UHF, /* REFCLK_RIPENCC (43) */ + CTL_SST_TS_UHF, /* REFCLK_NEOCLOCK4X (44) */ }; -- cgit v1.1