From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 10 Mar 2015 12:10:57 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
X-Git-Tag: NTP_4_3_8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca14b5cd603f16f051a6b6c1dd4d7a7a43871c78;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2752

bk: 54fedf51x9dYA9rGBIGobcwBiZQ6gg
---

ca14b5cd603f16f051a6b6c1dd4d7a7a43871c78
diff --cc ChangeLog
index 697c6c473,9abc73d62..8e8cafa4a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,9 @@@
+ * [Bug 2752] Update for mkver.bat for Windows from David Taylor.
+   Account for release numbering scheme for 4.3.x and later.
 +Below are from 4.2.8p2:
 +* [Bug 2774] Unreasonably verbose printout - leap pending/warning
  (4.3.7) 2015/03/07 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2784] Fix for 2782 uses clock_gettime() instead of time().
  (4.3.6) 2015/03/06 Released by Harlan Stenn <stenn@ntp.org>
  Below are from 4.2.8p2:
  * [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.