From: Dave Hart <hart@ntp.org>
Date: Tue, 9 Nov 2010 04:45:12 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1709
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f24196457282eba41211d29c062a230cd1701286;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1709
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1574-1683-91-1709

bk: 4cd8d1d85YVpOTrzOCP5x5bs_x5MkQ
---

f24196457282eba41211d29c062a230cd1701286
diff --cc ChangeLog
index 54da03b3e5,fef5873cec..a54f5534f1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,10 @@@
  ---
  
 +* [Bug 1574] sntp:set_time doesn't set tv_usec correctly.
 +* [Bug 1683] Interface binding does not seem to work as intended.
 +* [Bug 1691] Use first NMEA sentence each second.
+ * [Bug 1709] ntpdate ignores replies with equal receive and transmit
+   timestamps.
  
  ---
  (4.2.6p3-RC8) 2010/10/29 Released by Harlan Stenn <stenn@ntp.org>