merge cleanup

bk: 55bf3702nMUhwCmHhvPlMqWkbDuHeQ

diff --git a/ChangeLog b/ChangeLog
index c578268823a12eda92e5156725496e60d967876f..b4be0cf30871da16e08d79cfd305c580338324d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2889] ntp-dev-4.3.67 does not build on Windows.  perlinger@ntp.org
 (4.3.69) 2015/08/01 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2821] minor build issues: fixed refclock_gpsdjson.c.  perlinger@ntp.org