Skip to content

Commit

Permalink
Merge pull request #69 from Interrupt/features/move-to-zlib
Browse files Browse the repository at this point in the history
Moving to zlib license. Fixes #6
  • Loading branch information
Interrupt authored Sep 17, 2020
2 parents 2b52a21 + 1a2e008 commit 33a71d0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
32 changes: 14 additions & 18 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
Copyright (C) 2018 Chad Cuddigan
Copyright (c) <2020> <Priority Interrupt LLC>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation is required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. Modifications to this software used for redistribution must also be made
available.
4. Chad Cuddigan retains the ability to relicence this software, but not any
derivative redistributions, at a later time.
5. This notice may not be removed or altered from any source distribution,
without permission.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This source release does not contain or cover the game data from Delver, the gam

# License

This source code release is licensed under the Delver Open Source license. [See LICENSE.txt for more information.](LICENSE.txt)
This source code release is licensed under the zlib Open Source license. [See LICENSE.txt for more information.](LICENSE.txt)

# Notes

Expand Down

0 comments on commit 33a71d0

Please sign in to comment.