merge cleanup

bk: 551da3f3MMRQemxRiH07ACT0ZLR4dw

diff --git a/ChangeLog b/ChangeLog
index 3892211e78abeee092c9f29643dc84a4fc830870..a28ad8db7f4467fc04f91990a56809f83a3fbc3f 100644 (file)
--- 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.