From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Apr 2018 06:58:50 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P12~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7358c8fb506a75b3ab19761c116bcf51b59601d;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3456

bk: 5ac9bdaamoWZPSla1nZYBXqayPi_pw
---

a7358c8fb506a75b3ab19761c116bcf51b59601d
diff --cc ChangeLog
index 2981eef66,28b44f2ee..ffc3357a0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,9 @@@
  ---
+ 
 +* [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
 + - According to Brooks Davis, there was only one location <perlinger@ntp.org>
+ * [Bug 2821] minor build issues <perlinger@ntp.org>
+  - applied patches by Christos Zoulas, including real bug fixes
  
  ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>