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 /docs/progmasoft-catch3.md | |
| parent | 79f624d693b4fc3167c239c3eca47c858799333f (diff) | |
| parent | 2fbb5585e35078cb2490c8ae988860aa6dc0399d (diff) | |
| download | catch3-security/bounded-strings.tar.gz | |
Merge branch 'devel' into security/bounded-stringssecurity/bounded-strings
Diffstat (limited to 'docs/progmasoft-catch3.md')
| -rw-r--r-- | docs/progmasoft-catch3.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/progmasoft-catch3.md b/docs/progmasoft-catch3.md index 49754af1..ee222e6d 100644 --- a/docs/progmasoft-catch3.md +++ b/docs/progmasoft-catch3.md @@ -232,8 +232,8 @@ Do not rename or rewrite Catch2 headers, `Catch` symbols, macros, runner options or upstream coding style as part of this extension. New functionality belongs in separately licensed Progmasoft headers and uses Progmasoft's PascalCase C++ types/functions and project naming conventions. Catch2-originated source files -remain under BSL-1.0; Progmasoft-authored source files carry the MPL-2.0 plus -Progmasoft linking-exception SPDX expression shown in their headers. The two +remain under BSL-1.0; Progmasoft-authored source files are under +LGPL-3.0-or-later, as their headers say. The two areas are not relicensed as a whole. Any proposed upstream PR must be prepared under Catch2's contribution rules as a separate contribution, rather than reusing a source file whose license header says otherwise. |