From 2397193b36e6d980414ef146a367564ff0f1d7d8 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 3 Jun 2020 21:04:50 -0400 Subject: [PATCH] treewide: Relicense --- LICENSE | 31 +++++++++++++++++++++++++++++-- README.md | 2 ++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 70dcba4..ebaec3f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +The MIT License (MIT) with restrictions -Copyright (c) 2017 William Woodruff +Copyright (c) 2020 William Woodruff Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,30 @@ 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. + +The following terms additionally apply and override any above terms for +applicable parties: + +You may not use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software in a military or law enforcement context, +defined as follows: + +1. A military context is a professional context where the intended application +of the Software is integration or use with or by military software, tools +(software or hardware), or personnel. This includes contractors and +subcontractors as well as research affiliates of any military organization. + +2. A law enforcement context is a professional context where the intended +application of the Software is integration or use with or by law enforcement +software, tools (software or hardware), or personnel. This includes +contractors and subcontractors as well as research affiliates of any law +enforcement organization. + +Entities that sell or license to military or law enforcement organizations +may use the Software under the original terms, but only in contexts that do +not assist or supplement the sold or licensed product. + +Students and academics who are affiliated with research institutions may use +the Software under the original terms, but only in contexts that do not assist +or supplement collaboration or affiliation with any military or law +enforcement organization. diff --git a/README.md b/README.md index 38065ce..dab0b55 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ ff2mpv ====== +![license](https://raster.shields.io/badge/license-MIT%20with%20restrictions-green.png) + This is a Firefox addon for playing URLs in MPV. Clicking the little icon in your toolbar will make MPV attempt to play the current URL.