summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-12 17:06:03 +0200
committerwm4 <wm4@nowhere>2017-06-12 17:06:03 +0200
commita3be4cf2aba97fa8d726d815a56ed8b942448b0e (patch)
treeb408d1aaa133930ee6fdcffd670eccd551366ecf
parent2cded0ea9f3f4756b1169274974f7e7a85ef87ba (diff)
downloadmpv-a3be4cf2aba97fa8d726d815a56ed8b942448b0e.tar.bz2
mpv-a3be4cf2aba97fa8d726d815a56ed8b942448b0e.tar.xz
mpv.rc, mpv.exe.manifest: change license to LGPL
All authors have agreed. mpv.exe.manifest probably can't have a copyright header, so it doesn't. These files don't add license info to the executables. And of course the executable license is still GPL.
-rw-r--r--Copyright4
-rw-r--r--osdep/mpv.rc16
2 files changed, 9 insertions, 11 deletions
diff --git a/Copyright b/Copyright
index ddee409850..23b224d450 100644
--- a/Copyright
+++ b/Copyright
@@ -182,8 +182,8 @@ LGPL relicensing status:
osdep/main-fn.h LGPL
osdep/main-fn-unix.c LGPL
osdep/main-fn-win.c LGPL
- osdep/mpv.exe.manifest easy
- osdep/mpv.rc easy
+ osdep/mpv.exe.manifest LGPL
+ osdep/mpv.rc LGPL
osdep/path.h LGPL
osdep/path-macosx.m LGPL
osdep/path-unix.c LGPL
diff --git a/osdep/mpv.rc b/osdep/mpv.rc
index 8212437574..405ddc3029 100644
--- a/osdep/mpv.rc
+++ b/osdep/mpv.rc
@@ -1,20 +1,18 @@
/*
- * Windows resource file for mpv
- *
* This file is part of mpv.
*
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#include <winver.h>