merge cleanup

bk: 5585fcc6WnTXdgrHokB-gc1aRA8kNw

diff --git a/ChangeLog b/ChangeLog
index 6f53dbae4795b7dd313fba266a054f2859f9fdfb..6a8124df7e4d5849d361b9792725ccc28a90e4e0 100644 (file)
--- 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.