From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 28 Jul 2010 03:14:28 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_7P41~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c38c3e424b875a973e90de359ab26e44516f99;p=thirdparty%2Fntp.git

merge cleanup

bk: 4c4fa094kAKV418GDIibK1aioeWAYA
---

diff --git a/ChangeLog b/ChangeLog
index 9cf9b64d0..46a78503a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
+  string mismatch.
 * [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.
 * Avoid race with parallel builds using same source directory in
   scripts/genver by using build directory for temporary files.