merge cleanup

bk: 56641aealBrnu5cofjcbi75mGCuecg

diff --git a/ChangeLog b/ChangeLog
index 2ecb15728225912c7ea5aa53fd59533a4bd3d2c6..d2522c5e8771e30183afd518a893da61d2564cc2 100644 (file)
--- 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.