diff options
author | wm4 <wm4@nowhere> | 2013-10-13 01:18:50 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-10-13 01:36:10 +0200 |
commit | a5507312093adb99fc80f09276561eb333999cba (patch) | |
tree | 1c3e3486f0de52ff74d9d42603090f7404343a79 /osdep | |
parent | 0933f12d28ec82776550032cce32e505b2d3e3c6 (diff) | |
download | mpv-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 'osdep')
-rw-r--r-- | osdep/mpv.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/mpv.rc b/osdep/mpv.rc index 789fef1c70..17726c03ef 100644 --- a/osdep/mpv.rc +++ b/osdep/mpv.rc @@ -31,7 +31,7 @@ FILETYPE VFT_APP { BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP { - VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 3.\000" + VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 2 or later.\000" VALUE "CompanyName", "mpv\000" VALUE "FileDescription", "mpv - video player\000" VALUE "FileVersion",VERSION |