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

Commit

Permalink
Merge branch 'release/4.2.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
Olical committed Dec 8, 2014
2 parents e8167ce + 8c0c76d commit 4e1bee2
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
6 changes: 3 additions & 3 deletions EventEmitter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* EventEmitter v4.2.10 - git.io/ee
* Oliver Caldwell
* MIT license
* EventEmitter v4.2.11 - git.io/ee
* Unlicense - http://unlicense.org/
* Oliver Caldwell - http://oli.me.uk/
* @preserve
*/

Expand Down
6 changes: 3 additions & 3 deletions EventEmitter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ You can also get a copy of EventEmitter through the following package managers:
* [Bower][] (eventEmitter)
* [Component][] (Wolfy87/EventEmitter)

## License (MIT)
## Unlicense

Copyright (c) 2011-2014 Oliver Caldwell
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.

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:
>This is free and unencumbered software released into the public domain.
>
>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.
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

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.
I gave people the chance to object in issue #84, which also explains my reasoning.

[guide]: https://github.com/Wolfy87/EventEmitter/blob/master/docs/guide.md
[api]: https://github.com/Wolfy87/EventEmitter/blob/master/docs/api.md
Expand All @@ -82,3 +82,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
[http-server]: https://www.npmjs.org/package/http-server
[node.js]: http://nodejs.org/
[gitter]: https://gitter.im/Wolfy87/EventEmitter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
[unlicense]: http://unlicense.org/
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eventEmitter",
"description": "Event based JavaScript for the browser",
"version": "4.2.10",
"version": "4.2.11",
"main": [
"./EventEmitter.js"
],
Expand All @@ -11,8 +11,8 @@
},
"licenses": [
{
"type": "MIT",
"url": "https://github.com/Wolfy87/EventEmitter#license-mit"
"type": "Unlicense",
"url": "http://unlicense.org/"
}
],
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "eventEmitter",
"repo": "Wolfy87/EventEmitter",
"description": "Event based JavaScript for the browser.",
"version": "4.2.10",
"version": "4.2.11",
"scripts": ["EventEmitter.js"],
"main": "EventEmitter.js",
"license": "MIT"
"license": "Unlicense"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wolfy87-eventemitter",
"version": "4.2.10",
"version": "4.2.11",
"description": "Event based JavaScript for the browser",
"main": "EventEmitter.js",
"directories": {
Expand All @@ -22,7 +22,7 @@
"email": "[email protected]",
"url": "http://oli.me.uk/"
},
"license": "MIT",
"license": "Unlicense",
"readmeFilename": "README.md",
"bugs": {
"url": "https://github.com/Wolfy87/EventEmitter/issues"
Expand Down

0 comments on commit 4e1bee2

Please sign in to comment.