version number merge cleanup

author Harlan Stenn <stenn@ntp.org>

Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)

committer Harlan Stenn <stenn@ntp.org>

Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)
author Harlan Stenn <stenn@ntp.org>
Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)
committer Harlan Stenn <stenn@ntp.org>
Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)
diff --cc Makefile.am
Simple merge
diff --cc NEWS

index 2c05648dad37687418d42ce0a107432c3c456a06,86662487c854f2417587c002824bcfeba4b2e403..95fe21603737883976e3a6e64186211754a08cb3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,6 -1,5 +1,7 @@@
+ +* wwv and chu refclock improvements
+ +* OpenSSL integration
   --
+ * clock state machine bugfix
   * Lose the source port check on incoming packets
   * (x)ntpdc compatibility patch
   * Virtual IP improvements
author	Harlan Stenn <stenn@ntp.org>
	Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Sat, 26 Oct 2002 02:06:11 +0000 (22:06 -0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history