Merge pogo:/usa/bruckman/ntp-dev into whimsy.udel.edu:/backroom/ntp-dev

author Harlan Stenn <stenn@ntp.org>

Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)

committer Harlan Stenn <stenn@ntp.org>

Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)
author Harlan Stenn <stenn@ntp.org>
Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)
committer Harlan Stenn <stenn@ntp.org>
Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)
diff --cc ntpdc/ntpdc_ops.c
Simple merge
diff --cc ntpq/ntpq.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Tue, 7 Oct 2003 21:10:34 +0000 (17:10 -0400)
		1	2
ntpdc/ntpdc_ops.c	patch \|	diff1 \|	diff2 \|	blob \| history
ntpq/ntpq.c	patch \|	diff1 \|	diff2 \|	blob \| history