From: NTP Release Engineering <stenn@ntp.org>
Date: Sat, 28 Dec 2024 09:54:42 +0000 (-0800)
Subject: Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-stable
X-Git-Tag: NTP_4_3_107~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d61774c2b660aa2d1b163b9fabe8e4a647fdd01;p=thirdparty%2Fntp.git

Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-stable
into  ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-dev

bk: 676fcae27bfE7AffuZirFV3YMBmqAg
---

2d61774c2b660aa2d1b163b9fabe8e4a647fdd01
diff --cc ChangeLog
index 54ba4b831,df15157be..c21fd734e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
 ----
 +
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@ntp.org>
+ * Makefile.am: Another tweak to check-local.  <stenn@ntp.org>
  * cleanup github-specific files.  <stenn@ntp.org>
  * Add COPYRIGHT.md and LICENSE.md.  <stenn@ntp.org>
  * Makefile.am: Fix distcheck problem with check-local.  <stenn@ntp.org>