merge cleanup

bk: 55b8a6c8dFogJU73Kiv9jS8siHvM5Q

diff --git a/ChangeLog b/ChangeLog
index 53b5c926f5cb5d3f514ea1253654eae3712a4e82..9d9083bee8bad8ce7c99a59d43289fa541e53936 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Below are from 4.2.8p4:
+* Added tests/ntpd/ntp_scanner.c test. Damir Tomić.
+* Added declarations to all Unity tests, and did minor fixes to them.
+  Reduced the number of warnings by half. Damir Tomić.
+* Updated generate_test_runner.rb and updated the sntp/unity/auto directory
+  with the latest Unity updates from Mark. Damir Tomić.
 (4.3.66) 2015/07/28 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Typo fix for GCC warning suppression.  Harlan Stenn.