From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 24 Oct 2010 07:36:28 +0000 (-0400)
Subject: merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a4d3b3b33fcabaeeeba29b1e4bc903de6b8cc11;p=thirdparty%2Fntp.git

merge cleanup

bk: 4cc3e1fc5jIrPt_IMx3aODc_6tDQLw
---

diff --git a/ChangeLog b/ChangeLog
index a3e7ec9945..a42b564580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1571] from 4.2.63-RC6: NMEA does not relate data to PPS edge.
+* [Bug 1572] from 4.2.63-RC6: NMEA time adjustment for GPZDG buggy.
 * [Bug 1675] from 4.2.6p3-RC6: Prohibit includefile remote config.
 * Enable generating ntpd/ntp_keyword.h after keyword-gen.c changes on
   Windows as well as POSIX platforms.