merge cleanup

bk: 4d658306U1HEQvU6WPeAxNkMFt0hRg

diff --git a/ChangeLog b/ChangeLog
index 92a6c7e9cf92364164546e51813bfd08cd46c41a..4d96b3a3f950a7d895154c780e5819f4e78a548c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
-(4.2.7p133) 2011/02/23 Released by Harlan Stenn <stenn@ntp.org>
-* [Bug 1834] ntpdate 4.2.7p131 aborts with assertion failure.
 * [Bug 1837] Build fails on Win7 due to regedit requiring privilege.
 * Provide fallback definitions for GetAdaptersAddresses() for Windows
   build environments lacking iphlpapi.h.
+* Rename file containing 1.xxxx ChangeSet revision from version to
+  scm-rev to avoid invoking GNU make implicit rules attempting to
+  compile version.c into version.  Problem was with sntp/version.o
+  during make distcheck after fix for spurious sntp rebuilds.
+* Add INC_ALIGNED_PTR() macro to align pointers like malloc().
+(4.2.7p133) 2011/02/23 Released by Harlan Stenn <stenn@ntp.org>
+* [Bug 1834] ntpdate 4.2.7p131 aborts with assertion failure.
 * Move sntp last in top-level Makefile.am SUBDIRS so that the libevent
   tearoff (if required) and sntp are compiled after the rest.
 * Use a single set of Automake options for each package in configure.ac
@@ -11,11 +16,6 @@
   sntp/version was out-of-date relative to phony target FRC.version.
 * Do not cache paths to perl, test, or pkg-config, searching the PATH
   at configure time is worth it to pick up tool updates.
-* Rename file containing 1.xxxx ChangeSet revision from version to
-  scm-rev to avoid invoking GNU make implicit rules attempting to
-  compile version.c into version.  Problem was with sntp/version.o
-  during make distcheck after fix for spurious sntp rebuilds.
-* Add INC_ALIGNED_PTR() macro to align pointers like malloc().
 (4.2.7p132) 2011/02/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1832] ntpdate doesn't allow timeout > 2s.
 * [Bug 1833] The checking sem_timedwait() fails without -pthread.