From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 24 Jun 2015 15:33:57 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_45~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a7d732108b72e9344be61bb39750b3e1f297906;p=thirdparty%2Fntp.git

merge cleanup

bk: 558acde5quDekSFFjlNbPZ4VwX3vPQ
---

diff --git a/ChangeLog b/ChangeLog
index 47453567e..eadf88609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Below are from 4.2.8p3:
+* [Bug 2855] Implement conditional leap smear code.  Martin Burnicki.
+* [Bug 2855] leap smear cleanup.  Harlan Stenn.
+* Initial support for experimental leap smear code.  Harlan Stenn.
+* automake-1.15 cleanup for sntp/tests/fileHandlingTest.h.in .  Harlan Stenn.
 (4.3.44) 2015/06/22 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * Initial support for experimental leap smear code.  Harlan Stenn.