From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 10 Oct 2012 06:08:16 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P311~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe9ed8be3a910e08ee310084aaa3fe71b9b6869;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 507510d0hAJpy-gPldUWwoFnD6KvgA
---

4fe9ed8be3a910e08ee310084aaa3fe71b9b6869
diff --cc ChangeLog
index fc92a7bd9,153aab41b..b56988b70
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,8 @@@
 +* [Bug 938] The argument to the -D flag takes a number, not a string.
- * [Bug 1374] Support SO_TIMESTAMPNS.
 +* [Bug 1013] ntpdate's HTML page claims wrong default version.
 +* [Bug 1374] Support SO_TIMESTAMPNS.
+ (4.2.7p310) 2012/10/09 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1374] Support SO_TIMESTAMPNS.
  * [Bug 2266] Remove deprecated refclock_trak.c from Windows Makefile
    equivalents.
  * [Bug 2274] Bring libopts/enum.c back to (old) ANSI C compliance.