merge cleanup

bk: 4cc3e1fc5jIrPt_IMx3aODc_6tDQLw

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