From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 23 Feb 2011 21:39:19 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1837
X-Git-Tag: NTP_4_2_7P134~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68a627b6f67083145b4f1093bc8a4e6d89346cb2;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1837
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d657e87ORQqQVpbSXuMzf7b_dzaWQ
---

68a627b6f67083145b4f1093bc8a4e6d89346cb2
diff --cc ChangeLog
index 65686dcfc,904614947..92a6c7e9c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,8 @@@
 +(4.2.7p133) 2011/02/23 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1834] ntpdate 4.2.7p131 aborts with assertion failure.
+ * [Bug 1837] Build fails on Win7 due to regedit requiring privilege.
+ * Provide fallback definitions for GetAdaptersAddresses() for Windows
+   build environments lacking iphlpapi.h.
  * Move sntp last in top-level Makefile.am SUBDIRS so that the libevent
    tearoff (if required) and sntp are compiled after the rest.
  * Use a single set of Automake options for each package in configure.ac