From: Dave Hart <hart@ntp.org>
Date: Sun, 19 Apr 2009 17:51:40 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccbdbbd4b3367ea244334313c0d6ed18fdebf192;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125-52-3-7-8-9

bk: 49eb64acEhNbanDSG1bn0_50ywVCXA
---

ccbdbbd4b3367ea244334313c0d6ed18fdebf192
diff --cc ChangeLog
index 81cbe793f1,e3d79b1e0e..5fe7f1af77
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
+ * [Bug 1125] C runtime per-thread initialization on Windows
 +* [Bug 1152] temporarily disable refclock_parse, refclock_true until
 +  maintainers can repair build break from pps_sample()
 +* [Bug 1153] refclock_nmea should not mix UTC with GPS time
 +* [Bug 1159] ntpq overlap diagnostic message test buggy
  (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.