From: Dave Hart <hart@ntp.org>
Date: Sat, 30 Jan 2010 16:42:08 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d059bf87b00e31e8fc4bd3c68a9d5be355a31ae6;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1468-69

bk: 4b6461600P1PKhTk7KSc8FszuublUw
---

d059bf87b00e31e8fc4bd3c68a9d5be355a31ae6
diff --cc ChangeLog
index 250376378a,519728e3d6..c707b7108e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
+ (4.2.7p12) 2010/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1468] 'make install' broken for root on default NFS mount.
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
  (4.2.7p11) 2010/01/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 47] Debugging and logging do not work after a fork.
  * [Bug 1010] getaddrinfo() could block and thus should not be called by