From: Dave Hart <hart@ntp.org>
Date: Sun, 27 Sep 2009 06:46:54 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-libisc-9.6.1-P1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8e3bbef439adf37fa18a2b2be0d6b0d3a67ca6c;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-libisc-9.6.1-P1
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-ylwrap

bk: 4abf0a5eRgKroIhg3c_GNIlRl6GMgw
---

d8e3bbef439adf37fa18a2b2be0d6b0d3a67ca6c
diff --cc ChangeLog
index 8ddba8d49c,92384b5296..fd7eb2cf98
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to
 +  mirror the upstream layout (lib/isc/...), and merge in NTP-local
 +  modifications to libisc.  There is a new procedure to ease future
 +  libisc merges using a separate "upstream" bk repo.  That will enable
 +  normal bk pull automerge to handle carrying forward any local changes
 +  and should enable us to take updated libisc snapshots more often.
+ * [Bug 1316] segfault if refclock_nmea can't open file.
  * [Bug 1317] Distribute cvo.sh.
  (4.2.5p220) 2009/09/25 Released by Harlan Stenn <stenn@ntp.org>
  * Rearrange libisc code to match the upstream layout in BIND.  This is