From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Aug 2015 09:05:49 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_69~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b2047c5095c522277524ce88c5146a97c29f1fb;p=thirdparty%2Fntp.git

merge cleanup

bk: 55bc8bedUW8lHaEFu4O5YgLab0ZHNw
---

diff --git a/ChangeLog b/ChangeLog
index 162c28f7a..cac406ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c.  perlinger@ntp.org
 (4.3.68) 2015/07/31 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.