diff options
| author | Leitwolf | 2026-11-15 22:58:40 +0300 |
|---|---|---|
| committer | GitHub | 2026-11-15 22:58:40 +0300 |
| commit | 21ce423a12523559abf83f7a2ed83e042efc418d (patch) | |
| tree | e83ae3454c5692f46c70876fb60fcc62828b2142 /tools/Amalgamation.cpp | |
| parent | 79f624d693b4fc3167c239c3eca47c858799333f (diff) | |
| parent | 2fbb5585e35078cb2490c8ae988860aa6dc0399d (diff) | |
| download | catch3-21ce423a12523559abf83f7a2ed83e042efc418d.tar.gz | |
Merge branch 'devel' into security/bounded-stringssecurity/bounded-strings
Diffstat (limited to 'tools/Amalgamation.cpp')
| -rw-r--r-- | tools/Amalgamation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/Amalgamation.cpp b/tools/Amalgamation.cpp index fc1d459a..bb396cb1 100644 --- a/tools/Amalgamation.cpp +++ b/tools/Amalgamation.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2026 Progmasoft. -// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0 +// SPDX-License-Identifier: LGPL-3.0-or-later #include <algorithm> #include <array> @@ -33,8 +33,8 @@ namespace Progmasoft::Catch3::Tools // You probably shouldn't edit it directly. // // The parts that come from src/Progmasoft, the Catch3 runner, keep -// their own copyright and license lines (MPL-2.0 WITH -// AdditionRef-Progmasoft-Exception-2.0). The runner needs C++17. +// their own copyright and license lines (LGPL-3.0-or-later). The +// runner needs C++17. // ---------------------------------------------------------- )"; @@ -45,7 +45,7 @@ namespace Progmasoft::Catch3::Tools // third_party/. You probably shouldn't edit it directly. // // yyjson and pugixml keep their MIT licenses, stated in their text below; -// the rest is MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0. Only +// the rest is LGPL-3.0-or-later. Only // catch_amalgamated.cpp includes this file. // ---------------------------------------------------------- )"; |