ChangeLog:

  merge cleanup

bk: 5d56643dnwpj72VlTDfwL_6IwXvY1Q

diff --git a/ChangeLog b/ChangeLog
index ff8a0452d646f41d8ed7f3f92553650cb4f84386..a796d737c88f463f632656f9ca945363539014d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 ---
 
+* [Bug 3604] Wrong param byte order passing into record_raw_stats() in
+       ntp_io.c <perlinger@ntp.org>
+  - fixed byte and paramter order as suggested by wei6410@sina.com 
 * [Bug 3599] Build fails on linux-m68k due to alignment issues <perlinger@ntp.org>
   - added padding as suggested by John Paul Adrian Glaubitz 
 * [Bug 3590] Update refclock_oncore.c to the new GPS date API <perlinger@ntp.org>
@@ -51,10 +54,6 @@
   - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
 
 ---
-* [Bug 3604] Wrong param byte order passing into record_raw_stats() in
-       ntp_io.c <perlinger@ntp.org>
-  - fixed byte and paramter order as suggested by wei6410@sina.com 
----
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Sec 3565] Crafted null dereference attack in authenticated