From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 27 Jun 2007 03:03:43 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P56~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1d136079271a126b9e2bf0193644db353eac8b;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 4681d38fnyKgqdapmAj6bMauWkX8cA
---

8b1d136079271a126b9e2bf0193644db353eac8b
diff --cc ChangeLog
index 299b974e8,c2703fae8..5a9f2fd35
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
 +* [Bug 863] unable to stop ntpd on Windows as the handle reference for events
 +            changed
- * Use emalloc() instead of malloc() in refclock_datum.c (Calypso).
+ * [Bug 858] recent leapfile changes broke non-OpenSSL builds.
+ * Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
  * Start using 'design by contract' assertions.
+ * [Bug 767] Fast sync to refclocks wanted.
  * Allow null driftfile.
  * leap second infrastructure fixes from Dave Mills.
  * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.