merge cleanup

bk: 558649e0CfImsU0eWoh_AqQBcVF8HA

diff --git a/ChangeLog b/ChangeLog
index c329fc25242542eca44e4a68c3f2f188cef0297e..40c8134eb15c8ccfb0d5820b6c1555a630348cbd 100644 (file)
--- 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: