From: Dave Hart <hart@ntp.org>
Date: Tue, 27 Oct 2009 03:33:58 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e6322da76a3b2c2d4a4bb522b658afb37ffc57;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1354

bk: 4ae66a26AE0qPczuahC1GoGXsVLczQ
---

37e6322da76a3b2c2d4a4bb522b658afb37ffc57
diff --cc ChangeLog
index f4435aad82,9f79681ad1..9fdb19ba2a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,15 @@@
+ * Changes from Dave Mills.
+ * driver4.html updates from Dave Mills.
 -* PPSAPI cleanup on ntpd/refclock_wwvb.c.
++* [Bug 1252] PPSAPI cleanup on ntpd/refclock_wwvb.c.
 +* [Bug 1354] libtool error building after bootstrap with Autoconf 2.64.
 +* Allow NTP_VPATH_HACK configure test to handle newer gmake versions.
 +* CIDs 94-99 make it more clearly impossible for sock_hash() to return
 +  a negative number.
 +* CID 105, 106 ensure ntpdc arrays are not overrun even if callers
 +  misbehave.
 +* CID 113 use va_end() in refclock_true.c true_debug().
 +* Get rid of configure tests for __ss_family and __ss_len when the more
 +  common ss_family and ss_len are present.
  (4.2.5p237-RC) 2009/10/26 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 610] NMEA support for using PPSAPI on a different device.
  * [Bug 1238] use only fudge time2 to offset NMEA serial timestamp.