Date: Sun, 22 Mar 2026 08:05:59 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen <tuukka.pasanen@ilmi.fi> Subject: git: 45b0c46d1c0b - stable/15 - diff3: Add SPDX-License-Identifier tag Message-ID: <69bfa2e7.3f3e4.5098d4c5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 commit 45b0c46d1c0b9148e2dd8ab7d532b66b8ac00952 Author: Tuukka Pasanen <tuukka.pasanen@ilmi.fi> AuthorDate: 2026-02-12 09:27:34 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-03-22 02:04:59 +0000 diff3: Add SPDX-License-Identifier tag Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55462 (cherry picked from commit 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9) --- usr.bin/diff3/diff3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 0f114163321f..d85a5da94b10 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -1,6 +1,8 @@ /* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ /* + * SPDX-License-Identifier: Caldera-no-preamble AND BSD-3-Clause + * * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. *home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bfa2e7.3f3e4.5098d4c5>