]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 10 Mar 2015 12:10:57 +0000 (12:10 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 10 Mar 2015 12:10:57 +0000 (12:10 +0000)
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2752

bk: 54fedf51x9dYA9rGBIGobcwBiZQ6gg

1  2 
ChangeLog

diff --cc ChangeLog
index 697c6c473f3e97f1a24c5bc9c910f2b0c0ea1d56,9abc73d6256180e3baceadd0bd6558c40d181b08..8e8cafa4aef72abc06398d8d321103b0466d488a
+++ 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.