From: Dave Hart <hart@ntp.org>
Date: Wed, 27 Jul 2011 15:35:15 +0000 (+0000)
Subject: Merge psp-os1:/home/karlsson/bugs/ntp-dev-1975
X-Git-Tag: NTP_4_2_7P197~1^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=545aa66781d2159024a1e749f016305fdd9cbe7a;p=thirdparty%2Fntp.git

Merge psp-os1:/home/karlsson/bugs/ntp-dev-1975
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1976

bk: 4e303033qUtRvfgKvYFw7rrenIc9yg
---

545aa66781d2159024a1e749f016305fdd9cbe7a
diff --cc ChangeLog
index e5fb53827,d7fcdc26b..0fb11ea7a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 1975] from 4.2.6p4-RC2: libntp/mktime.c won't work with 64-bit
+   time_t
 +* [Bug 1976] genLocInfo writes to srcdir break 'make distcheck'.
  (4.2.7p196) 2011/07/27 Released by Harlan Stenn <stenn@ntp.org>
  * DEFAULT INSTALLATION DIRECTORY CHANGES ON SOME OSes: to get the old
    behavior, pass --with-locfile=legacy to 'configure'