Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relicense future content under APGLv3 #850

Merged
merged 6 commits into from
Feb 18, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More changes
DebugOk committed Feb 18, 2024
commit 3f7c588fe9137a946c76ff1af48f9a66dd7aa353
5 changes: 4 additions & 1 deletion legal.md → LEGAL.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,10 @@ Note: We may make changes in within files that are licensed under MIT. These mod

---

Human-readable source code materials in this repository contributed **after** 17 February, 2024 at 23:00:00 UTC are licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 may be licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
Note: If a file does not explicitly relicense itself as AGPLv3, it is to be assumed that it is still under MIT.

Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.

## Warranty

45 changes: 45 additions & 0 deletions MARKERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# A quick summary of how to mark code files in this repository

## CSharp

All C# code contributed after 17 February, 2024 23:00:00 UTC should contain the following header:

```csharp
/*
* Delta-V - This file is licensed under AGPLv3
* Copyright (c) [Year] Delta-V Contributors
* See AGPLv3.txt for details.
*/
```

For any changes within MIT licensed(upstream) files, the following marker should be used at the start of the modification

```csharp
/* DeltaV - [Title of changes] - [Description of changes]
This code is licensed under AGPLv3. See LICENSE */
yourCodeHere();
// End of modified code
```

## Yaml

All Yaml files contributed after 17 February, 2024 23:00:00 UTC should contain the following header:

```yaml
# Delta-V - This file is licensed under AGPLv3
# Copyright (c) [Year] Delta-V Contributors
# See AGPLv3.txt for details.
```

For any changes within MIT licensed(upstream) files, the following marker should be used at the start of the modification

```yaml
# DeltaV - [Title of changes] - [Description of changes]
# This code is licensed under AGPLv3. See LICENSE
modifiedYaml: "Goes Here"
# End of modified code
```

## Note

Both Space Wizards and Nyanotrasen code is licensed under MIT, and any changes made to their code should be marked as AGPLv3 with the above markers.