~samwhited/xmpp

0b584a07658de371baeca34de99dade941a2e222 — Sam Whited 7 years ago e9b9343
Allow licensing under the MIT License as well
2 files changed, 26 insertions(+), 3 deletions(-)

M LICENSE
M README.md
M LICENSE => LICENSE +24 -2
@@ 1,5 1,8 @@
Copyright © 2014, Sam Whited
All rights reserved.
# Licenses

Copyright © 2014 Sam Whited

## BSD 2-claus license

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:


@@ 21,3 24,22 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

## MIT License

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:

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.

M README.md => README.md +2 -1
@@ 20,7 20,8 @@ resourceparts.

Copyright 2014 Sam Whited.
Use of this source code is governed by the BSD 2-clause license that can be
found in the LICENSE file.
found in the LICENSE file or the MIT License (also in the LICENSE file) at your
disgression.

[rfc6122]: https://www.rfc-editor.org/rfc/rfc6122.txt
[idna2008]: http://www.unicode.org/reports/tr46/#IDNA2008