summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-13 01:18:50 +0200
committerwm4 <wm4@nowhere>2013-10-13 01:36:10 +0200
commita5507312093adb99fc80f09276561eb333999cba (patch)
tree1c3e3486f0de52ff74d9d42603090f7404343a79 /DOCS
parent0933f12d28ec82776550032cce32e505b2d3e3c6 (diff)
downloadmpv-a5507312093adb99fc80f09276561eb333999cba.tar.bz2
mpv-a5507312093adb99fc80f09276561eb333999cba.tar.xz
Copyright, LICENSE: switch to GPL version 2 or later
Now that talloc has been removed, the license can be switched back to GPLv2+. Actually, there never was a GPLv2+ licensed MPlayer (fork or not) until now, but removal of some GPLv2-only code makes this possible now. Rewrite the Copyright file to explain the reasons for the licenses MPlayer and forks use. The old Copyright file didn't contain anything interesting anymore, and all information it contained is available at other places in the source tree. The reason for the license change itself is that it should improve interoperability with differently licensed code in general. This essentially reverts commit 1752808.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/changes.rst1
-rw-r--r--DOCS/man/en/mpv.rst2
2 files changed, 2 insertions, 1 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst
index 489fadd36c..af05cc332e 100644
--- a/DOCS/man/en/changes.rst
+++ b/DOCS/man/en/changes.rst
@@ -36,6 +36,7 @@ General Changes for MPlayer to mplayer2
General Changes for mplayer2 to mpv
-----------------------------------
+* Switch back to GPLv2+.
* Removal of lots of unneeded code to encourage developer activity (less
obscure scary zombie code that kills any desire for hacking the codebase)
* Removal of dust and dead bodies (code-wise), such as kernel drivers for
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst
index 5b61257999..300a023326 100644
--- a/DOCS/man/en/mpv.rst
+++ b/DOCS/man/en/mpv.rst
@@ -6,7 +6,7 @@ a movie player
##############
:Author: wm4
-:Copyright: GPLv3
+:Copyright: GPLv2+
:Manual section: 1
:Manual group: multimedia