Skip to content
This repository was archived by the owner on May 17, 2021. It is now read-only.

Commit 4e1bee2

Browse files
committed
Merge branch 'release/4.2.11'
2 parents e8167ce + 8c0c76d commit 4e1bee2

6 files changed

+20
-19
lines changed

EventEmitter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
2-
* EventEmitter v4.2.10 - git.io/ee
3-
* Oliver Caldwell
4-
* MIT license
2+
* EventEmitter v4.2.11 - git.io/ee
3+
* Unlicense - http://unlicense.org/
4+
* Oliver Caldwell - http://oli.me.uk/
55
* @preserve
66
*/
77

EventEmitter.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ You can also get a copy of EventEmitter through the following package managers:
5757
* [Bower][] (eventEmitter)
5858
* [Component][] (Wolfy87/EventEmitter)
5959

60-
## License (MIT)
60+
## Unlicense
6161

62-
Copyright (c) 2011-2014 Oliver Caldwell
62+
This project used to be released under MIT, but I release everything under the [Unlicense][] now. Here's the gist of it but you can find the full thing in the `UNLICENSE` file.
6363

64-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
64+
>This is free and unencumbered software released into the public domain.
65+
>
66+
>Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
6567
66-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
67-
68-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
68+
I gave people the chance to object in issue #84, which also explains my reasoning.
6969

7070
[guide]: https://github.com/Wolfy87/EventEmitter/blob/master/docs/guide.md
7171
[api]: https://github.com/Wolfy87/EventEmitter/blob/master/docs/api.md
@@ -82,3 +82,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
8282
[http-server]: https://www.npmjs.org/package/http-server
8383
[node.js]: http://nodejs.org/
8484
[gitter]: https://gitter.im/Wolfy87/EventEmitter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
85+
[unlicense]: http://unlicense.org/

bower.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "eventEmitter",
33
"description": "Event based JavaScript for the browser",
4-
"version": "4.2.10",
4+
"version": "4.2.11",
55
"main": [
66
"./EventEmitter.js"
77
],
@@ -11,8 +11,8 @@
1111
},
1212
"licenses": [
1313
{
14-
"type": "MIT",
15-
"url": "https://github.com/Wolfy87/EventEmitter#license-mit"
14+
"type": "Unlicense",
15+
"url": "http://unlicense.org/"
1616
}
1717
],
1818
"keywords": [

component.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "eventEmitter",
33
"repo": "Wolfy87/EventEmitter",
44
"description": "Event based JavaScript for the browser.",
5-
"version": "4.2.10",
5+
"version": "4.2.11",
66
"scripts": ["EventEmitter.js"],
77
"main": "EventEmitter.js",
8-
"license": "MIT"
8+
"license": "Unlicense"
99
}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wolfy87-eventemitter",
3-
"version": "4.2.10",
3+
"version": "4.2.11",
44
"description": "Event based JavaScript for the browser",
55
"main": "EventEmitter.js",
66
"directories": {
@@ -22,7 +22,7 @@
2222
"email": "[email protected]",
2323
"url": "http://oli.me.uk/"
2424
},
25-
"license": "MIT",
25+
"license": "Unlicense",
2626
"readmeFilename": "README.md",
2727
"bugs": {
2828
"url": "https://github.com/Wolfy87/EventEmitter/issues"

0 commit comments

Comments
 (0)