From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 15 Aug 2011 21:47:36 +0000 (-0400)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P204~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561fdfad2e554bd366b7fea0a2edbf0b0d841adc;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-newnmea

bk: 4e4993f8TWomzGYmSOwGTqISILiHlQ
---

561fdfad2e554bd366b7fea0a2edbf0b0d841adc
diff --cc ChangeLog
index 637df7c2e,5249ff04f..4f635e1ed
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* Added support for Garmin's $PGRMF sentence to NMEA driver
+ * [Bug 1988] Better sntp send failed error message needed.
+ * [Bug 1990] sntp output should include stratum.
  (4.2.7p203) 2011/08/13 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1986] Require Visual C++ 2005 or later compilers in Windows port.
  * Actually use long long for (u_)int64 by correcting spelling of