From: Dave Hart <hart@ntp.org>
Date: Mon, 14 Sep 2009 09:30:16 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P211~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34cfbbc1bdcd480d97f0123355e13ac8a9272166;p=thirdparty%2Fntp.git

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

bk: 4aae0d28KmVdSW9tqIJ3rAyIHLNNGQ
---

34cfbbc1bdcd480d97f0123355e13ac8a9272166
diff --cc ChangeLog
index 50c970e84,2ad591217..8a040b87a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 663] respect ntpq -c and -p order on command line.
+ * [Bug 1292] more VC6 unsigned __int64 workarounds.
 +* [Bug 1296] Added Support for Trimble Acutime Gold.
  (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