Merge bk://www.ntp.org/home/bk/ntp-dev

author Danny Mayer <mayer@ntp.org>

Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)

committer Danny Mayer <mayer@ntp.org>

Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)
author Danny Mayer <mayer@ntp.org>
Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)
committer Danny Mayer <mayer@ntp.org>
Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)
diff --cc configure.ac
Simple merge
diff --cc ntpd/ntp_control.c
Simple merge
diff --cc ntpd/ntp_io.c
Simple merge
author	Danny Mayer <mayer@ntp.org>
	Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)
committer	Danny Mayer <mayer@ntp.org>
	Sat, 9 Oct 2004 23:26:50 +0000 (19:26 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_control.c	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_io.c	patch \|	diff1 \|	diff2 \|	blob \| history