From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 6 May 2016 10:22:20 +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=57fb8eb41f2e0fa595936ee6548d3c74b44336dd;p=thirdparty%2Fntp.git

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

bk: 572c705cyltY59pPg9iVGdo_IK3T0A
---

57fb8eb41f2e0fa595936ee6548d3c74b44336dd
diff --cc ChangeLog
index ce7f59d45,3e50cd9ad..7602cd5cd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,11 @@@
  ---
  
 +* [Bug 3038] NTP fails to build in VS2015. perlinger@ntp.org
 +  - provide build environment
 +  - 'wint_t' and 'struct timespec' defined by VS2015
 +  - fixed print()/scanf() format issues
-   
+ * Fix typo in ntp-wait and plot_summary.  HStenn.
+ 
  ---
  (4.2.8p7) 2016/04/26 Released by Harlan Stenn <stenn@ntp.org>