From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Apr 2015 20:17:55 +0000 (+0000)
Subject: merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae72ceea482b9f59cb7aef51cd47a92690d5c5a;p=thirdparty%2Fntp.git

merge cleanup

bk: 551da3f3MMRQemxRiH07ACT0ZLR4dw
---

diff --git a/ChangeLog b/ChangeLog
index 3892211e7..a28ad8db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,10 @@
 ---
-* [Bug 2795] Cannot build without OpenSLL (on Win32).
-  fixed some minor warnings
----
 
 * [Bug 2788] New flag -G (force_step_once).
 * [Bug 2794] Clean up kernel clock status reports.
 * [Bug 2795] Cannot build without OpenSLL (on Win32).
   Provided a Win32 specific wrapper around libevent/arc4random.c.
+  fixed some minor warnings.
 * [Bug 2796] ntp-keygen crashes in 'getclock()' on Win32.
 * [Bug 2797] ntp-keygen trapped in endless loop for MD5 keys
   on big-endian machines.