Skip to content

Commit 146ee1f

Browse files
authored
Merge pull request surmon-china#82 from vladimyr/master
Relicense to dual MIT/GPL-3.0
2 parents e1fa5d9 + aebda35 commit 146ee1f

File tree

4 files changed

+32
-1
lines changed

4 files changed

+32
-1
lines changed

LICENSE LICENSE-GPL3

File renamed without changes.

LICENSE-MIT

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Permission is hereby granted, free of charge, to any
2+
person obtaining a copy of this software and associated
3+
documentation files (the "Software"), to deal in the
4+
Software without restriction, including without
5+
limitation the rights to use, copy, modify, merge,
6+
publish, distribute, sublicense, and/or sell copies of
7+
the Software, and to permit persons to whom the Software
8+
is furnished to do so, subject to the following
9+
conditions:
10+
11+
The above copyright notice and this permission notice
12+
shall be included in all copies or substantial portions
13+
of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
16+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
17+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
18+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
19+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
22+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

README.md

+8
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,14 @@ export default {
212212
- [videojs-hotkeys](https://github.com/ctd1500/videojs-hotkeys)
213213
- [more plugins...](https://github.com/search?o=desc&q=videojs+plugin&s=stars&type=Repositories&utf8=%E2%9C%93)
214214

215+
# License
216+
217+
Licensed under either of
218+
219+
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
220+
* GNU General Public License, version 3 ([LICENSE-GPL](LICENSE-GPL) or https://opensource.org/licenses/GPL-3.0)
221+
222+
at your option.
215223

216224
# Author Blog
217225
[Surmon](https://surmon.me)

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"email": "[email protected]",
2323
"url": "http://surmon.me"
2424
},
25-
"license": "GPL",
25+
"license": "MIT OR GPL-3.0",
2626
"bugs": {
2727
"url": "https://github.com/surmon-china/vue-video-player/issues"
2828
},

0 commit comments

Comments
 (0)