From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Jun 2015 03:26:22 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_49~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04d8ab3ee589109d133784567620f248eda60951;p=thirdparty%2Fntp.git

merge cleanup

bk: 5590badeKXqxAhDwCXCx5mVfwPo4GA
---

diff --git a/ChangeLog b/ChangeLog
index 6ed774298..6894a9ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Below are from 4.2.8p3:
 * [Bug 2860] ntpq ifstats sanity check is too stringent.  Frank Kardel.
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
+* tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
 (4.3.48) 2015/06/28 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p3:
 * [Bug 1060] Buffer overruns in libparse/clk_rawdcf.c.  Helge Oldach.