merge cleanup

bk: 557bf1d4IFDzsHDXvWDxOrLyai8X4Q

diff --git a/ChangeLog b/ChangeLog
index 932c4292f917c3f2b3e892874bd85076892aeea4..06231fef94d6fdb0e79207e0f0eb44e5a66d0fe0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p3:
+* Unity test framework
 (4.3.39) 2015/06/12 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 2843] make check fails on 4.3.36