From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 17 May 2016 08:50:22 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54494774cdf2630088eb9302d27d44b696461b29;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p8

bk: 573adb4eAdoO3V2vDNUaJMY_qcwJog
---

54494774cdf2630088eb9302d27d44b696461b29
diff --cc ChangeLog
index e930510b4,84954a1c4..587c37a78
--- a/ChangeLog
+++ b/ChangeLog
@@@ -7,8 -4,10 +7,10 @@@
    - provide build environment
    - 'wint_t' and 'struct timespec' defined by VS2015
    - fixed print()/scanf() format issues
+ * [Bug 3052] Add a .gitignore file.  Edmund Wong.
+ * [Bug 3054] miscopt.html documents the allan intercept in seconds. SWhite.
  * Fix typo in ntp-wait and plot_summary.  HStenn.
 -  
 +
  ---
  (4.2.8p7) 2016/04/26 Released by Harlan Stenn <stenn@ntp.org>