From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 15 Aug 2011 22:27:13 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P204~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09f9a813d33b7fa3f19f4a4901951ea6929afba9;p=thirdparty%2Fntp.git

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

bk: 4e499d41iwJpNABeCSXnA1ePFcWyCw
---

09f9a813d33b7fa3f19f4a4901951ea6929afba9
diff --cc ChangeLog
index 4f635e1ed,af74646bc..6f3540d62
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
 +* Added support for Garmin's $PGRMF sentence to NMEA driver
  * [Bug 1988] Better sntp send failed error message needed.
+ * [Bug 1989] sntp manual page sometimes refers to SNTP as a program.
  * [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.