Merge

author Harlan Stenn <stenn@ntp.org>

Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)

committer Harlan Stenn <stenn@ntp.org>

Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)
author Harlan Stenn <stenn@ntp.org>
Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)
committer Harlan Stenn <stenn@ntp.org>
Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)
diff --cc NEWS

index cd236e75099cbf4b2c62f747131d9504e7db0c14,4f47e3b1a3b8632d24b07193021fb22e08888124..8fed7aa2d86a8b743ad07cb2cdf4d83dd40bc4fe
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,5 +1,9 @@@
+ +* Bugfixes
+ +* call-gap filtering
+ +* wwv and chu refclock improvements
+ +* OpenSSL integration
   --
+ (4.1.2)
   * clock state machine bugfix
   * Lose the source port check on incoming packets
   * (x)ntpdc compatibility patch
author	Harlan Stenn <stenn@ntp.org>
	Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Thu, 17 Jul 2003 10:31:45 +0000 (06:31 -0400)