summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-12 17:00:20 +0200
committerwm4 <wm4@nowhere>2017-06-12 17:00:20 +0200
commit2cded0ea9f3f4756b1169274974f7e7a85ef87ba (patch)
tree3d8593ab96bc7a029dba92c78bb388050deac123
parent5c42c70bfdfa59c8bcbcc9fec010cdd232c89453 (diff)
downloadmpv-2cded0ea9f3f4756b1169274974f7e7a85ef87ba.tar.bz2
mpv-2cded0ea9f3f4756b1169274974f7e7a85ef87ba.tar.xz
m_property: change license to LGPL
All involved authors have agreed.
-rw-r--r--Copyright2
-rw-r--r--options/m_property.c14
-rw-r--r--options/m_property.h14
3 files changed, 15 insertions, 15 deletions
diff --git a/Copyright b/Copyright
index 6df443c2a9..ddee409850 100644
--- a/Copyright
+++ b/Copyright
@@ -158,7 +158,7 @@ LGPL relicensing status:
misc/*.* LGPL
options/m_config.* medium
options/m_option.* medium
- options/m_property.* easy
+ options/m_property.* LGPL
options/options.* very hard (lots of options and history)
options/parse_commandline.* easy
options/parse_configfile.* easy
diff --git a/options/m_property.c b/options/m_property.c
index 9dad34fd1b..2ef5a62123 100644
--- a/options/m_property.c
+++ b/options/m_property.c
@@ -1,18 +1,18 @@
/*
* 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/>.
*/
/// \file
diff --git a/options/m_property.h b/options/m_property.h
index d6c8c5aab3..9a1e3295dc 100644
--- a/options/m_property.h
+++ b/options/m_property.h
@@ -1,18 +1,18 @@
/*
* 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/>.
*/
#ifndef MPLAYER_M_PROPERTY_H