From: Dave Hart <hart@ntp.org>
Date: Sat, 23 May 2009 02:20:04 +0000 (+0000)
Subject: Merge bk://maccarony.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf4bad923fc5d0701e0ff32063c689ab45cfcf5;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1041-1196

bk: 4a175d54c0f3960Kd3-F4g9o5SjYXQ
---

caf4bad923fc5d0701e0ff32063c689ab45cfcf5
diff --cc ChangeLog
index 271970d428,809590f01d..369233592d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,7 @@@
- * Bug [1041] manycastclient fails with 4.2.5p120.
- * Bug [1193] Compile error: conflicting types for emalloc.
- * Bug [1196] VC6 winsock2.h does not define SO_EXLUSIVEADDRUSE.
- * xmt -> aorg timestamp cleanup from Dave Mills, reported by Dave Hart.
 -* [Bug 1193] Compile error: conflicting types for emalloc
+ * [Bug 1041] xmt -> aorg timestamp cleanup from Dave Mills,
+   reported by Dave Hart.
++* [Bug 1193] Compile error: conflicting types for emalloc.
++* [Bug 1196] VC6 winsock2.h does not define SO_EXLUSIVEADDRUSE.
  * Leap/expire cleanup from Dave Mills.
  (4.2.5p178) 2009/05/21 Released by Harlan Stenn <stenn@ntp.org>
  * Provide erealloc() and estrdup(), a la emalloc().