From 93f0844af33e92df30b63fa0c3f7319105a6a8e1 Mon Sep 17 00:00:00 2001 From: Samantaz Fox Date: Wed, 27 Oct 2021 15:43:46 +0200 Subject: [PATCH] Concatenate the two license files --- LICENSE_CC0.md => LICENSE.md | 36 ++++++++++++++++++++++++++++++++++++ LICENSE_UNLICENSE.md | 24 ------------------------ 2 files changed, 36 insertions(+), 24 deletions(-) rename LICENSE_CC0.md => LICENSE.md (82%) delete mode 100644 LICENSE_UNLICENSE.md diff --git a/LICENSE_CC0.md b/LICENSE.md similarity index 82% rename from LICENSE_CC0.md rename to LICENSE.md index 0e259d4..ab0fbcb 100644 --- a/LICENSE_CC0.md +++ b/LICENSE.md @@ -1,3 +1,39 @@ +This work is released in the public domain. + +The main license for this repo is the "UNLICENSE", but the Creative +Commons Zero ("CCO") license can also be applied in the case where a +jurisdiction doesn't recognize the former. + +--- + + +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +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 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. + +For more information, please refer to + +--- + Creative Commons Legal Code CC0 1.0 Universal diff --git a/LICENSE_UNLICENSE.md b/LICENSE_UNLICENSE.md deleted file mode 100644 index fdddb29..0000000 --- a/LICENSE_UNLICENSE.md +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -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 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. - -For more information, please refer to