From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 24 Oct 2010 07:05:02 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1675-win-keyword
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc621577121388995ff096f4aefa8fb13201451;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1675-win-keyword
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-1571-2

bk: 4cc3da9ebcM8TCVfw4TKouEI3Jluhg
---

cdc621577121388995ff096f4aefa8fb13201451
diff --cc ChangeLog
index 642e0b75b6,4ca07be049..962b95645b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -421,7 -418,8 +421,9 @@@
  * [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
  ---
  
+ * [Bug 1571] NMEA does not relate data to PPS edge
+ * [Bug 1572] NMEA time adjustment for GPZDG buggy
 +* [Bug 1675] Prohibit includefile remote config.
  
  ---
  (4.2.6p3-RC5) 2010/10/22 Released by Harlan Stenn <stenn@ntp.org>