From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 23 May 2009 01:22:22 +0000 (-0400)
Subject: Merge bk://maccarony.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b09186bc1cd18059efe7216e13b9428ed205d3b9;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-320-1192

bk: 4a174fceNx9BOrtjHxWWcS7q1kE7FQ
---

b09186bc1cd18059efe7216e13b9428ed205d3b9
diff --cc ChangeLog
index 0b96a8b247,b4f8b95598..40727a4c2f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* Bug [1193] Compile error: conflicting types for emalloc
+ * xmt -> aorg timestamp cleanup from Dave Mills, reported by Dave Hart.
+ * 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().
  * Improve ntp.conf's parser error messages.