From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Aug 2015 09:40:18 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_70~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38cc7267b0d258a2ae42d40d554ab329a869754e;p=thirdparty%2Fntp.git

merge cleanup

bk: 55bf3702nMUhwCmHhvPlMqWkbDuHeQ
---

diff --git a/ChangeLog b/ChangeLog
index c57826882..b4be0cf30 100644
--- 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