From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 6 Dec 2015 11:24:26 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_88~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e31a8e7797169b8bf79ff48f4f52059323da4b7;p=thirdparty%2Fntp.git

merge cleanup

bk: 56641aealBrnu5cofjcbi75mGCuecg
---

diff --git a/ChangeLog b/ChangeLog
index 2ecb15728..d2522c5e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p5:
+* Quiet a warning from clang.  Harlan Stenn.
 (4.3.87) 2015/12/05 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * CID 1341677: Nits in sntp/tests/keyFile.c.  HStenn.