From: NTP Release Engineering <stenn@ntp.org>
Date: Fri, 27 Dec 2024 11:15:42 +0000 (-0800)
Subject: Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-stable
X-Git-Tag: NTP_4_3_107~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2292deba117d8dda9d12ea03c8aa09e515c33446;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: 676e8c5exu6-U1D3lFDC5a8Ty2zkFQ
---

2292deba117d8dda9d12ea03c8aa09e515c33446
diff --cc ChangeLog
index 72e2c2ecf,674c8e8ce..7d2e8ba60
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,9 +1,12 @@@
 ----
 +
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <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>
 +	
 +(4.3.106) 2024/11/28 Released by Harlan Stenn <stenn@ntp.org>
 +
  * build script: Use hostname.site for NTF build hosts.  Use the full
    hostname for the buildkey.  <stenn@ntp.org>
  * flock-build: Try to use the full hostname for the buildkey.  <stenn@ntp.org>