From: Dave Hart <hart@ntp.org>
Date: Wed, 28 Oct 2009 07:45:47 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4136f77ff76a9c197b095f2aa3c0c5f81097f2ac;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1356
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1356-8

bk: 4ae7f6ab9kXiZ91yN8AniU74r0RC8Q
---

4136f77ff76a9c197b095f2aa3c0c5f81097f2ac
diff --cc ChangeLog
index d64d20d9c4,7633bdfa40..e85c38c426
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 1356] core dump from refclock_nmea when can't open /dev/gpsU.
+ * [Bug 1358] AIX 4.3 sntp/networking.c IPV6_JOIN_GROUP undeclared.
  (4.2.5p238-RC) 2009/10/27 Released by Harlan Stenn <stenn@ntp.org>
  * Changes from Dave Mills.
  * driver4.html updates from Dave Mills.