From: Dave Hart <hart@ntp.org>
Date: Sun, 6 Sep 2009 08:41:32 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P210~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b5e2d8c2af86d0ea7045923036c5d29f7e2f765;p=thirdparty%2Fntp.git

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

bk: 4aa375bcq3UowYpbn564ml7xyt9rbg
---

2b5e2d8c2af86d0ea7045923036c5d29f7e2f765
diff --cc ChangeLog
index 825c8a318,cd94f4395..37969dac7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 1294] Use OPENSSL_INC and OPENSSL_LIB macros for Windows
 +  and remove unnecessary reference to applink.c for Windows
+ * [Bug 1295] trap directive options are not optional.
+ * [Bug 1297] yylex() must always set yylval before returning.
  (4.2.5p209) 2009/09/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1290] Fix to use GETTIMEOFDAY macro
  * [Bug 1289] Update project files for VC6, VS2003, VS2005, VS 2008