From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Jul 2015 23:24:53 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_58~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba03998455e8a6b36f52e8bf69b184c93b4d5d21;p=thirdparty%2Fntp.git

merge cleanup

bk: 55a1a5c5ENSqSZvn6pEoedE8AkAIEQ
---

diff --git a/ChangeLog b/ChangeLog
index ada4dded5..6f6c33382 100644
--- 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.