summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-24 23:53:31 +0200
committerwm4 <wm4@nowhere>2015-07-24 23:54:51 +0200
commit95b930f8661c5967206739d3d5a6728191393817 (patch)
treee57b6e07b15c2e161a68d6dab79f40cbe1322c7e /DOCS
parentbdc60daffaaa71034684307606d0ec320649829c (diff)
downloadmpv-95b930f8661c5967206739d3d5a6728191393817.tar.bz2
mpv-95b930f8661c5967206739d3d5a6728191393817.tar.xz
Require contributions in LGPLv2.1+
As suggested in #2033. Additionally, change "LGPLv2+" to "LGPLv2.1+". Since this was always used with the "and later" phrase, this doesn't require any further discussion. Also clarify that the "+" means "or later". This should be clear to anyone with a brain, but you never know with copyright.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/contribute.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/DOCS/contribute.md b/DOCS/contribute.md
index 19563e90c5..d3bf1d49a3 100644
--- a/DOCS/contribute.md
+++ b/DOCS/contribute.md
@@ -54,6 +54,9 @@ Sending patches
change in the same commit.
- If you add a new command line option, document it in options.rst. If you
add a new input property, document it in input.rst.
+- All new code must be LGPLv2.1+ licensed, or come with the implicit agreement
+ that it will be relicensed to LGPLv2.1+ later (see ``Copyright`` in the
+ repository root directory).
Code formatting
---------------