From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Apr 2009 06:26:09 +0000 (+0000)
Subject: ChangeLog:
X-Git-Tag: NTP_4_2_5P164~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5bd1156ae797984ce0b6ca70256536bd7c9e467;p=thirdparty%2Fntp.git

ChangeLog:
  merge cleanup

bk: 49ec1581U6MzgMFSc8epg-fldMngYg
---

diff --git a/ChangeLog b/ChangeLog
index 0369d2ad6..a97e5b979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@
 * [Bug 1152] temporarily disable refclock_parse, refclock_true until
   maintainers can repair build break from pps_sample()
 * [Bug 1153] refclock_nmea should not mix UTC with GPS time
-* [Bug 1157] quiet OpenSSL warnings, clean up configure.ac
-* [Bug 1158] support for aix6.1
 * [Bug 1159] ntpq overlap diagnostic message test buggy
 (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
@@ -231,8 +229,8 @@
 * [Bug 980] Direct help to stdout.
 ---
 
-* [Bug 1158] support for aix6.1
 * [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
 
 ---