Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-autogen

author Harlan Stenn <stenn@ntp.org>

Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)

committer Harlan Stenn <stenn@ntp.org>

Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)
author Harlan Stenn <stenn@ntp.org>
Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)
committer Harlan Stenn <stenn@ntp.org>
Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)
diff --cc ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
diff --cc html/copyright.html
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)
committer	Harlan Stenn <stenn@ntp.org>
	Mon, 6 Mar 2023 03:18:34 +0000 (21:18 -0600)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
html/copyright.html	patch \|	diff1 \|	diff2 \|	blob \| history