summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-20 19:58:29 +0200
committerwm4 <wm4@nowhere>2017-06-20 19:58:29 +0200
commit856fb767f1c7bae6e8f6e8673bd55a848f804e40 (patch)
tree6d326750684cb867df868e363bb6072bfe0c3b6f
parentaaeec09f03bc14a099b113541b372dfdf52a5dab (diff)
downloadmpv-856fb767f1c7bae6e8f6e8673bd55a848f804e40.tar.bz2
mpv-856fb767f1c7bae6e8f6e8673bd55a848f804e40.tar.xz
input/keycodes: change license to LGPL
All relevant authors have agreed. See 2e84934be7 (the mentioned person has replied and agreed now).
-rw-r--r--Copyright2
-rw-r--r--input/keycodes.c14
-rw-r--r--input/keycodes.h16
3 files changed, 15 insertions, 17 deletions
diff --git a/Copyright b/Copyright
index 004e0bf1c8..9d84ae3f22 100644
--- a/Copyright
+++ b/Copyright
@@ -160,7 +160,7 @@ x audio/audio.* very hard (mp_audio based of anders' af_audi
input/ipc.c LGPL
input/ipc-unix.c LGPL
input/ipc-win.c LGPL
-x input/keycodes.* (pending)
+ input/keycodes.* LGPtir
input/pipe-win32.c LGPL
libmpv/*.* LGPL
misc/*.* LGPL
diff --git a/input/keycodes.c b/input/keycodes.c
index d6c07288c2..b518a81443 100644
--- a/input/keycodes.c
+++ b/input/keycodes.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/>.
*/
#include <stddef.h>
diff --git a/input/keycodes.h b/input/keycodes.h
index faf8c811cb..d7c1b8450f 100644
--- a/input/keycodes.h
+++ b/input/keycodes.h
@@ -1,20 +1,18 @@
/*
- * KEY code definitions for keys/events not passed by ASCII value
- *
* 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_KEYCODES_H