From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Dec 2010 21:15:40 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable
X-Git-Tag: NTP_4_2_7P99~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3dcfd346f78ac6b9fd3b073a14a945a9121553;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1757

bk: 4d0fc77cpGhzwAwzBsAeJCtBxG84jg
---

de3dcfd346f78ac6b9fd3b073a14a945a9121553
diff --cc ChangeLog
index daf62709c,55ef60b2d..944f4b107
--- a/ChangeLog
+++ b/ChangeLog
@@@ -10,8 -11,10 +11,11 @@@
    local timezone.
  * [Bug 1751] Support for Atari FreeMiNT OS.
  * [Bug 1754] --version output should be more verbose.
 +* [Bug 1757] oncore snprintf("%m") doesn't expand %m.
- * Upgrade to libopts 33.5.8 from AutoGen 5.11.6pre3.
+ * [Bug 1758] setsockopt IPV6_MULTICAST_IF with wrong ifindex.
+ * [Bug 1760] ntpd Windows interpolation cannot be disabled.
+ * [Bug 1762] manycastclient solicitation responses interfere.
+ * Upgrade to libopts 34.0.9 from AutoGen 5.11.6pre5.
  * Suppress ntp-keygen OpenSSL version display for --help, --version,
    display both build and runtime OpenSSL versions when they differ.
  * Clean up m4 quoting in configure.ac, *.m4 files, resolving