Merge whimsy.udel.edu:/backroom/ntp-stable

author Harlan Stenn <stenn@ntp.org>

Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)

committer Harlan Stenn <stenn@ntp.org>

Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)
author Harlan Stenn <stenn@ntp.org>
Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)
committer Harlan Stenn <stenn@ntp.org>
Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)
diff --cc include/ntp_control.h
Simple merge
diff --cc include/ntp_refclock.h
Simple merge
diff --cc include/ntpd.h
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Wed, 20 Jul 2005 02:13:32 +0000 (22:13 -0400)
		1	2
include/ntp_control.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/ntp_refclock.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/ntpd.h	patch \|	diff1 \|	diff2 \|	blob \| history