From: Dave Hart <hart@ntp.org>
Date: Thu, 17 Dec 2009 09:28:53 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1412
X-Git-Tag: NTP_4_2_6P1_RC1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80813df3b4465d17730b2625d6af3a211b7c866;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1412
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18

bk: 4b29f9d5VVIym6Gku-Yr_Zuzo5viOA
---

c80813df3b4465d17730b2625d6af3a211b7c866
diff --cc ChangeLog
index 55bece3f0,a0f8a12ee..4681bbb0d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
  
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
+ * Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>