From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 21 Jun 2015 05:21:36 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_43~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da384da0bb04c53ebfd2e6d5e124d2baad7fdf62;p=thirdparty%2Fntp.git

merge cleanup

bk: 558649e0CfImsU0eWoh_AqQBcVF8HA
---

diff --git a/ChangeLog b/ChangeLog
index c329fc252..40c8134eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +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.
+* Fixes to sntp/tests/fileHandlingTest.h.in.  Harlan Stenn.
 * Unity cleanup.
 (4.3.42) 2015/06/17 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3: