Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Amend license

Browse Source
This commit is contained in:
skylarmt 2015-01-20 16:03:40 -07:00
parent 3336eee268
commit 3e67cd318d
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LICENSE
View File

@ -19,6 +19,10 @@ this list of conditions and the following disclaimer in the documentation and/or
may be used to endorse or promote products derived from this software without
specific prior written permission.
4. You adhere to the Media License detailed below. If you do not, this license
is automatically revoked and you must purge all copies of the software you
possess, in source or binary form.
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
@ -37,11 +41,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
All images and other graphical files (the "graphics") included with this
software are copyright (c) 2015 Apocalypse Laboratories. You may not distribute
them or any program, source code repository, or other package containing them
without written permission from Apocalypse Laboratories. However, removal of
the graphics or replacement with your own will allow you to redistribute the
remainder of the software according to the Code License.
the graphics or any program, source code repository, or other digital storage
media containing them without written permission from Apocalypse Laboratories.
This ban on distribution only applies to publicly available systems.
A password-protected network file share, USB drive, or other storage scheme that
cannot be easily accessed by the public is generally allowed. If in doubt,
contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies
you permission, that decision is considered final and binding.
==============================
Other Licenses

17
src/net/apocalypselabs/symat/help/licenses.html
View File

@ -24,6 +24,10 @@
may be used to endorse or promote products derived from this software without
specific prior written permission.
<br>
4. You adhere to the Media License detailed below. If you do not, this license
is automatically revoked and you must purge all copies of the software you
possess, in source or binary form.
<br>
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
@ -36,10 +40,13 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
<p>All images and other graphical files (the "graphics") included with this
software are copyright (c) 2015 Apocalypse Laboratories. You may not distribute
them or any program, source code repository, or other package containing them
without written permission from Apocalypse Laboratories. However, removal of
the graphics or replacement with your own will allow you to redistribute the
remainder of the software according to the Code License.</p>
the graphics or any program, source code repository, or other digital storage
media containing them without written permission from Apocalypse Laboratories.
This ban on distribution only applies to publicly available systems.
A password-protected network file share, USB drive, or other storage scheme that
cannot be easily accessed by the public is generally allowed. If in doubt,
contact Apocalypse Laboratories. If Apocalypse Laboratories allows or denies
you permission, that decision is considered final and binding.</p>
<h2>This application also uses libraries from third-parties.</h2>
<p><b>Symja (parser), log4j, Java-Prettify:</b></p>
<p>Licensed under the Apache License, Version 2.0 (the "License");<br>
@ -351,7 +358,7 @@
permanent authorization for you to choose that version for the<br>
Library.<br>
</p><br>
<p><br></p>
<p><b>Additional License</b></p>
<p> GNU GENERAL PUBLIC LICENSE<br>
Version 3, 29 June 2007<br>
<br>