From: Dave Hart <hart@ntp.org>
Date: Sat, 11 Jul 2009 05:48:53 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1237-8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18402441f8b7fac9b52f8d0fdc6e478bd41424bd;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1237-8
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1042-1237-8-44

bk: 4a5827c5AGmJsgSSHTH8c5_jsAXKow
---

18402441f8b7fac9b52f8d0fdc6e478bd41424bd
diff --cc ChangeLog
index 99df273439,44a459631f..a248062244
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* [Bug 1042] multicast listeners IPv4+6 ignore new interfaces.
+ * [Bug 1237] Windows serial code treat CR and LF both as line
+   terminators.
+ * [Bug 1238] use fudge time2 for serial timecode offset in NMEA driver.
  (4.2.5p185) 2009/07/01 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.
  * [Bug 1234] convert NMEA driver to use common PPSAPI code.