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

merge cleanup

bk: 55918b16s5xcyaVFyTHd5X1PWQ46yw
---

diff --git a/ChangeLog b/ChangeLog
index 108934ae5..2202cb994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Below are from 4.2.8p3:
 * README.leapsmear added.  Martin Burnicki.
 * README.leapsmear edited.  Harlan Stenn.
 * tests/libntp/msyslog.c: fixed a gcc warning. Tomasz Flendrich.
+* ntpd/ntp.conf.def: Document DSCP and leapsmearinterval.  Harlan Stenn.
+* html/miscopt.html: Document leapsmearinterval, other cleanup.  Harlan Stenn.
 (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.