Merge cleanup

bk: 550e683aEgZYuu2F6fzv1qZCJrqhkQ

diff --git a/ChangeLog b/ChangeLog
index 96e3b99639161fcbb5d61411a508effde5315647..1a2850d749b789c9542ff3ab919c7091632377dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28 +1,6 @@
 ---
 
-* [Bug 2791] Quiet compiler warnings from libevent.
 * [Bug 1787] DCF77's formerly "antenna" bit is "call bit" since 2003.
-* Comment from Juergen Perlinger in ntp_calendar.c to make the code clearer.
-* Use predefined function types for parse driver functions
-  used to set up function pointers.
-  Account for changed prototype of parse_inp_fnc_t functions.
-  Cast parse conversion results to appropriate types to avoid
-  compiler warnings.
-  Let ioctl() for Windows accept a (void *) to avoid compiler warnings
-  when called with pointers to different types.
-* [Bug 2777] Fixed loops and decoding of Meinberg GPS satellite info.
-  Removed non-ASCII characters from some copyright comments.
-  Removed trailing whitespace.
-  Updated definitions for Meinberg clocks from current Meinberg header files.
-  Now use C99 fixed-width types and avoid non-ASCII characters in comments.
-  Account for updated definitions pulled from Meinberg header files.
-  Updated comments on Meinberg GPS receivers which are not only called GPS16x.
-  Replaced some constant numbers by defines from ntp_calendar.h
-  Modified creation of parse-specific variables for Meinberg devices
-  in gps16x_message().
-  Reworked mk_utcinfo() to avoid printing of ambiguous leap second dates.
-  Modified mbg_tm_str() which now expexts an additional parameter controlling
-  if the time status shall be printed.
 * [Bug 2728] See if C99-style structure initialization works.
 * [Bug 2747] Upgrade libevent to 2.1.5-beta.
 * [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL. .
@@ -37,7 +15,29 @@
 * [Bug 2773] Early leap announcement from Palisade/Thunderbolt
 * [Bug 2774] Unreasonably verbose printout - leap pending/warning
 * [Bug 2775] ntp-keygen.c fails to compile under Windows.
+* [Bug 2777] Fixed loops and decoding of Meinberg GPS satellite info.
+  Removed non-ASCII characters from some copyright comments.
+  Removed trailing whitespace.
+  Updated definitions for Meinberg clocks from current Meinberg header files.
+  Now use C99 fixed-width types and avoid non-ASCII characters in comments.
+  Account for updated definitions pulled from Meinberg header files.
+  Updated comments on Meinberg GPS receivers which are not only called GPS16x.
+  Replaced some constant numbers by defines from ntp_calendar.h
+  Modified creation of parse-specific variables for Meinberg devices
+  in gps16x_message().
+  Reworked mk_utcinfo() to avoid printing of ambiguous leap second dates.
+  Modified mbg_tm_str() which now expexts an additional parameter controlling
+  if the time status shall be printed.
 * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.
+* [Bug 2791] Quiet compiler warnings from libevent.
+* Comment from Juergen Perlinger in ntp_calendar.c to make the code clearer.
+* Use predefined function types for parse driver functions
+  used to set up function pointers.
+  Account for changed prototype of parse_inp_fnc_t functions.
+  Cast parse conversion results to appropriate types to avoid
+  compiler warnings.
+  Let ioctl() for Windows accept a (void *) to avoid compiler warnings
+  when called with pointers to different types.
 ---
 (4.2.8p1) 2015/02/04 Released by Harlan Stenn <stenn@ntp.org>