From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 23 Jun 2011 06:42:14 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_7P186~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a469ea12ee53f8e33005bba605abd7e3c78de1c;p=thirdparty%2Fntp.git

merge cleanup

bk: 4e02e046zwUMvUuScxvr4_WrLkDLzw
---

diff --git a/ChangeLog b/ChangeLog
index 8d42b89f4..c1b29750a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,8 @@
 * Finish conversion to genLocInfo.
 * validate MANTAGFMT in genLocInfo.
 * [Bug 1950] Control installation of event_rpcgen.py.
-* ntp_locs.m4: handle the case where . is not in the PATH.
 (4.2.7p185) 2011/06/21 Released by Harlan Stenn <stenn@ntp.org>
-* . may not be in the PATH - ntp_locs.m4 fix.
+* ntp_locs.m4: handle the case where . is not in the PATH.
 * More genLocInfo cleanup.
 (4.2.7p184) 2011/06/20 Released by Harlan Stenn <stenn@ntp.org>
 * Added ntp_locs.m4.