Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev

author Harlan Stenn <stenn@ntp.org>

Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)

committer Harlan Stenn <stenn@ntp.org>

Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)
author Harlan Stenn <stenn@ntp.org>
Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)
committer Harlan Stenn <stenn@ntp.org>
Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)
diff --cc configure.ac
Simple merge
diff --cc include/ntpd.h
Simple merge
diff --cc ntpd/ntp_config.c
Simple merge
diff --cc ntpd/ntpd.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Wed, 26 Oct 2005 00:39:24 +0000 (20:39 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/ntpd.h	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntpd.c	patch \|	diff1 \|	diff2 \|	blob \| history