summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAriadna Vigo <arivigodr@gmail.com>2020-12-08 19:02:01 +0100
committerAriadna Vigo <arivigodr@gmail.com>2020-12-08 19:02:01 +0100
commit9467174c1170f283486a4db8f9d3c725f05d6e8b (patch)
tree399029423fc4a294de85465ba4bac4fbd2b70623
parent8db3bbf8518d6474a22a158eb0fcce1eeed31e8f (diff)
Changed license to Expat/MIT/X11-like, with permission of all copyright holders
-rw-r--r--LICENSE23
-rw-r--r--README.md4
2 files changed, 17 insertions, 10 deletions
diff --git a/LICENSE b/LICENSE
index d8f444e..f47f8eb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,20 @@
Copyright 2020 Ariadna Vigo <arivigodr@gmail.com>
Copyright 2020 Rubén Santos <ribal@cocaine.ninja>
-minitimer is licensed under the Apache License, Version 2.0 (the "License");
-you may not use these files except in compliance with the License. You may
-obtain a copy of the License at:
+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:
- http://www.apache.org/licenses/LICENSE-2.0
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License. \ No newline at end of file
+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.
diff --git a/README.md b/README.md
index 1e88c4a..f8f2f71 100644
--- a/README.md
+++ b/README.md
@@ -50,5 +50,5 @@ For further information on the usage of minitimer, please refer to the manual
page minitimer(1).
## License
-minitimer is licensed under the Apache Public License version 2.0. See LICENSE
-file for copyright and license details.
+minitimer is published under an MIT/X11/Expat-type License. See LICENSE file
+for copyright and license details.