diff --git a/LICENSE b/LICENSE index 3e5ba57..b5e3810 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/src/net/apocalypselabs/symat/help/licenses.html b/src/net/apocalypselabs/symat/help/licenses.html index b1979b0..e826281 100644 --- a/src/net/apocalypselabs/symat/help/licenses.html +++ b/src/net/apocalypselabs/symat/help/licenses.html @@ -24,6 +24,10 @@ 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 @@ -36,10 +40,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.

This application also uses libraries from third-parties.

Symja (parser), log4j, Java-Prettify:

Licensed under the Apache License, Version 2.0 (the "License");
@@ -351,7 +358,7 @@ permanent authorization for you to choose that version for the
Library.


-


+

Additional License

GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007