From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 23:52:38 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_43~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd65feebe9c53129fde3e81b10c60eaebf5b06d;p=thirdparty%2Fntp.git

merge cleanup

bk: 5585fcc6WnTXdgrHokB-gc1aRA8kNw
---

diff --git a/ChangeLog b/ChangeLog
index 6f53dbae4..6a8124df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Below are from 4.2.8p3:
+* [Bug 2852] 'make check' can't find unity.h.  Hal Murray.
+* [Bug 2854] Missing brace in libntp/strdup.c.  Masanari Iida.
+* Unity cleanup.
 (4.3.42) 2015/06/17 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * Unity cleanup.