Skip to content

Commit

Permalink
Relicense future code to MIT.
Browse files Browse the repository at this point in the history
  • Loading branch information
PJB3005 committed Mar 13, 2019
1 parent ae0d34c commit 010d324
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
File renamed without changes.
19 changes: 19 additions & 0 deletions LICENSE-MIT.TXT
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2019 Space Station 14 Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
12 changes: 10 additions & 2 deletions legal.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ The Authors retain all copyright to their respective work here submitted.

## License

All human-readable source code materials in this repository are licensed under the GPL, version 3. See `LICENSE-CODE`.
All images, models, and rigging files in this repository are licensed under the Creative Commons Attribution-ShareAlike 3.0 United States license, unless otherwise stated. See `LICENSE-ASSETS`.

All images, models, and rigging files in this repository are licensed under the Creative Commons Attribution-ShareAlike 3.0 United States license. See `LICENSE-ASSETS`.
## Code license

All human-readable source code materials in this repository contributed **before** 13 March, 2019 at 12:00:00 UTC are licensed under the GPL version 3, unless otherwise stated. See `LICENSE-GPLv3.TXT`.

All human-readable source code materials in this repository contributed **after** 13 March, 2019 at 12:00:00 UTC are licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.TXT`.

Furthermore, the following contributors have agreed to retroactively relicense their contributions to MIT:

* PJB3005

## Warranty

Expand Down

0 comments on commit 010d324

Please sign in to comment.