From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 11 May 2016 22:47:57 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3038
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9269e6ceafdf048a56e1d3f158a6ae6ac28fdff7;p=thirdparty%2Fntp.git

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

bk: 5733b69dSJH2q_peLLARfr9h3ysgQw
---

9269e6ceafdf048a56e1d3f158a6ae6ac28fdff7
diff --cc ChangeLog
index ce7f59d45,3e50cd9ad..ec6e3619a
--- 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>