Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3615

author Harlan Stenn <stenn@ntp.org>

Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)

committer Harlan Stenn <stenn@ntp.org>

Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)
author Harlan Stenn <stenn@ntp.org>
Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)
committer Harlan Stenn <stenn@ntp.org>
Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)
diff --cc ChangeLog
Simple merge
diff --cc include/ntp_refclock.h
Simple merge
diff --cc ntpd/ntp_refclock.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)
committer	Harlan Stenn <stenn@ntp.org>
	Thu, 26 Sep 2019 06:51:49 +0000 (06:51 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
include/ntp_refclock.h	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_refclock.c	patch \|	diff1 \|	diff2 \|	blob \| history