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

author Harlan Stenn <stenn@ntp.org>

Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)

committer Harlan Stenn <stenn@ntp.org>

Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)
author Harlan Stenn <stenn@ntp.org>
Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)
committer Harlan Stenn <stenn@ntp.org>
Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)
diff --cc include/ntp.h
Simple merge
diff --cc include/ntpd.h
Simple merge
diff --cc ntpd/ntp_proto.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)
committer	Harlan Stenn <stenn@ntp.org>
	Sat, 14 Dec 2002 22:06:36 +0000 (17:06 -0500)
		1	2
include/ntp.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/ntpd.h	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_proto.c	patch \|	diff1 \|	diff2 \|	blob \| history