From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 22 Mar 2015 07:59:12 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_10~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c67185e32e4bef974df19c405a803c12ec8a80;p=thirdparty%2Fntp.git

merge cleanup

bk: 550e7650vQ2KD2A5iSxonpZkY3e2dA
---

diff --git a/ChangeLog b/ChangeLog
index b4e06552a..07872b1dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@
 * [Bug 2790] If ntpd sets the Windows MM timer highest resolution
   pause briefly before measuring system clock precision to yield
   correct results.
-* [Bug 2791] Quiet compiler warnings from libevent.
 * Comment from Juergen Perlinger in ntp_calendar.c to make the code clearer.
 * Use predefined function types for parse driver functions
   used to set up function pointers.