From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 2 Feb 2010 08:29:50 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P14~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c0bf4536b54832e8fdd41cc23872fc0480a4543;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  poog.il.thewrittenword.com:/home/stenn/ntp-dev

bk: 4b67e27es82YnO3o5e29l9ylAvYMrw
---

6c0bf4536b54832e8fdd41cc23872fc0480a4543
diff --cc ChangeLog
index bc645cb17,2ce8fc73a..f2ba81085
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
- * [Bug 1467] Fix bogus rebuild of sntp/sntp.html.
 +* [Bug 1469] u_int32, int32 changes broke HP-UX 10.20 build.
+ (4.2.7p13) 2010/01/31 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.6p1) - [Bug 1467] Fix bogus rebuild of sntp/sntp.html.
  (4.2.7p12) 2010/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1468] 'make install' broken for root on default NFS mount.
  (4.2.7p11) 2010/01/28 Released by Harlan Stenn <stenn@ntp.org>