From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 10 Apr 2025 02:43:30 +0000 (-0700)
Subject: Merge ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable
X-Git-Tag: NTP_4_3_108~3^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c56e9ca6e498b0b89741e75804e879596d6941c;p=thirdparty%2Fntp.git

Merge ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable
into  ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable-YYYY

bk: 67f730525QKbZ0GyyKW2vjhmW59Hww
---

6c56e9ca6e498b0b89741e75804e879596d6941c
diff --cc ChangeLog
index df15157be0,af56c9833e..aa3b904e29
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,10 @@@
  ---
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@ntp.org>
+ * Update the copyright year.  <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>
  * Add .github to the top-level tree. <dlavigne@nwtime.org>
  * build script: Use hostname.site for NTF build hosts.  Use the full