ChangeLog:

  auto merge not quite right

bk: 49ecfd51vY7YwnXkD-oF_HkmBdnXAA

diff --git a/ChangeLog b/ChangeLog
index 8c944e99d7ca5135c0c3bea229e65145343357a7..e79bfaee6b8cc2067aa561380965f16341cb6bc9 100644 (file)
--- 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
 
 ---