final update for [Bug 1571] and [Bug 1572]

bk: 4cc22b28OrroW55UtgGdaMwtsSsWXw

diff --git a/ChangeLog b/ChangeLog
index e2231e29eaab5b5e973c4b0516895a3535f2ed06..77aebf1ed354a2dc90b475d7572e3b12883a87b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+---
+
+* [Bug 1571] NMEA does not relate data to PPS edge
+* [Bug 1572] NMEA time adjustment for GPZDG buggy
+
 ---
 (4.2.6p3-RC5) 2010/10/22 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
index 37a4bacce24dd89fa7230599cc7e9bea4fecd290..6dd4ab528d4f0955d90bf62201c662544399a0a9 100644 (file)
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -16,16 +16,6 @@
  *             hart@ntp.org, davehart@davehart.com
  */
 
-/*
-************************************************************************
-* MODIFIED FOR ENHANCED PPS PROCESSING AND SYNC TO ABSOLUTE TIME       *
-*                                                                      *
-* THIS IS AN INOFFICAL / UNPUBLISHED WORK; USE AT OWN RISK AND DO NOT  *
-* FILE ERRORS AGAINST ANY NTPD VERSION THAT USES IT!                   *
-************************************************************************
-*/
-const char NMEA_DISCLAIMER[] = "refclock_nmea: inofficial version -- no support";
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif