From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Apr 2009 22:55:13 +0000 (+0000)
Subject: ChangeLog:
X-Git-Tag: NTP_4_2_4P7_RC3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c85b0984740e0579184be30d00ed93cd880643d;p=thirdparty%2Fntp.git

ChangeLog:
  auto merge not quite right

bk: 49ecfd51vY7YwnXkD-oF_HkmBdnXAA
---

diff --git a/ChangeLog b/ChangeLog
index 8c944e99d..e79bfaee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,9 @@
+* [Bug 787] Bug fixes for 64-bit time_t on Windows
 * [Bug 813] Conditional naming of Event
-* [Bug 1156] lock_thread_to_processor() should be declared in header
 * [Bug 1147] System errors should be logged to msyslog()
-* [Bug 787] Bug fixes for 64-bit time_t on Windows
-
-
----
-
-* [Bug 1158] support for aix6.1
+* [Bug 1156] lock_thread_to_processor() should be declared in header
 * [Bug 1157] quiet OpenSSL warnings, clean up configure.ac
+* [Bug 1158] support for aix6.1
 * [Bug 1160] MacOS X is like BSD regarding F_SETOWN
 
 ---