merge cleanup

bk: 55a1a5c5ENSqSZvn6pEoedE8AkAIEQ

diff --git a/ChangeLog b/ChangeLog
index ada4dded5c6917ea2bbf6b5fc1fe65f0e10b6929..6f6c33382436f8c76208867a920f09d777dbfb20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Below are from 4.2.8p4:
 * [Bug 2875] sntp/Makefile.am: Get rid of DIST_SUBDIRS.  libevent must
   be configured for the distribution targets.  Harlan Stenn.
+* br-flock: --enable-local-libevent.  Harlan Stenn.
 (4.3.57) 2015/07/09 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Phase 1 deprecation of google test in tests/libntp/.  Harlan Stenn.