From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 16 Dec 2013 20:46:18 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P402~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab0377f234387b793f8464a80e0b93a2dc128567;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/kindernay/ntp-dev-final

bk: 52af669a5X0F_Z7gZBOTMhS2_tcXFw
---

ab0377f234387b793f8464a80e0b93a2dc128567
diff --cc ChangeLog
index 45e1ad0db6,46a8d394d2..e5e7b9fd18
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* Incorporate Oliver Kindernay's GSoC 2013 scripts/ cleanup.
+ (4.2.7p401) 2013/11/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2491] VS20xx compile fixes.
+ (4.2.7p400) 2013/11/29 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2491] VS2013 project files.
  (4.2.7p399) 2013/11/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2326] More leapsecond file notification cleanup.
  * [Bug 2506] make sure routing updates are always tracked