From: Dave Hart <hart@ntp.org>
Date: Sat, 12 Sep 2009 11:56:36 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1292
X-Git-Tag: NTP_4_2_5P211~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc06a9341b26dbf5c9abd88eb5c707b27d283bcb;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1292
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-663-1292

bk: 4aab8c74S-BbVqhmXw7EQLl8a_YfwA
---

cc06a9341b26dbf5c9abd88eb5c707b27d283bcb
diff --cc ChangeLog
index c64a826fd,63626a85c..2ad591217
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 663] respect ntpq -c and -p order on command line.
+ * [Bug 1292] more VC6 unsigned __int64 workarounds.
  (4.2.5p210) 2009/09/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1294] Use OPENSSL_INC and OPENSSL_LIB macros for Windows
    and remove unnecessary reference to applink.c for Windows