Skip to content

Commit

Permalink
corrected APNG Optimizer's license to zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
Benny- committed Jul 9, 2017
1 parent 607d5b8 commit b1ca5b9
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 21 deletions.
47 changes: 27 additions & 20 deletions LICENSE.txt
@@ -1,24 +1,31 @@
Copyright (c) 2016, Benny Jacobs
BSD 3-Clause License

Copyright (c) 2017, Benny Jacobs
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL Benny Jacobs BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
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.

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; 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.


10 changes: 10 additions & 0 deletions README.md
Expand Up @@ -148,3 +148,13 @@ python ./setup.py install

[APNG Disassembler](http://apngdis.sourceforge.net/)
[APNG Optimizer](https://sourceforge.net/projects/apng/files/APNG_Optimizer/)

## License

Not all software within this project uses the same license. The following licenses/legal terms are used:

- [zlib license](https://opensource.org/licenses/Zlib)
- [GNU LGPL 2.1](https://opensource.org/licenses/LGPL-2.1) for some older versions of some parts of the software
- Public Domain (if explicitly stated. The .py scripts are public domain)
- [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) where no other license applies (this readme)

2 changes: 1 addition & 1 deletion apng2webp_dependencies/apng2webp_apngopt/readme.txt
Expand Up @@ -7,7 +7,7 @@
Copyright (c) 2011-2015 Max Stepin
maxst@users.sourceforge.net

License: LGPL license
License: zlib license

--------------------------------

Expand Down

0 comments on commit b1ca5b9

Please sign in to comment.