diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-02-06 20:40:40 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-02-06 20:40:40 +0000 |
commit | 47f171be8f36fdfd3eeb42f741d1c8994a7873d3 (patch) | |
tree | c161ad836f1906235da5b3b2c503bb49e3ee68ee /licenses | |
parent | Replace copyright notice by proper license. (diff) | |
download | historical-47f171be8f36fdfd3eeb42f741d1c8994a7873d3.tar.gz historical-47f171be8f36fdfd3eeb42f741d1c8994a7873d3.tar.bz2 historical-47f171be8f36fdfd3eeb42f741d1c8994a7873d3.zip |
pymol license updated to new version
Diffstat (limited to 'licenses')
-rw-r--r-- | licenses/pymol | 100 |
1 files changed, 49 insertions, 51 deletions
diff --git a/licenses/pymol b/licenses/pymol index 7d075d5135c6..8764ec581f13 100644 --- a/licenses/pymol +++ b/licenses/pymol @@ -1,52 +1,50 @@ -Open-Source PyMOL Copyright Notice -================================== - -The Open-Source PyMOL source code is copyrighted, but you can freely -use and copy it as long as you don't change or remove any of the -Copyright notices. The Open-Source PyMOL product is made available -under the following open-source license terms: - ----------------------------------------------------------------------- -Open-Source PyMOL is Copyright (C) 1998-2003 Warren L. DeLano and -Copyright (C) 2003-2007 DeLano Scientific LLC, Palo Alto, -California, U.S.A., (www.delanoscientific.com). - - All Rights Reserved - -Permission to use, copy, modify, distribute, and distribute modified -versions of this software and its built-in documentation for any -purpose and without fee is hereby granted, provided that the above -copyright notice appears in all copies and that both the copyright -notice and this permission notice appear in supporting documentation, -and that the names of Warren L. DeLano or DeLano Scientific LLC not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -WARREN LYFORD DELANO AND DELANO SCIENTIFIC LLC DISCLAIM ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL WARREN LYFORD DELANO -OR DELANO SCIENTIFIC LLC BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE -USE OR PERFORMANCE OF THIS SOFTWARE. ----------------------------------------------------------------------- - -PyMOL Trademark Notice -====================== - -PyMOL(TM) is a trademark of DeLano Scientific LLC. Derivative -software which contains PyMOL source code must be plainly -distinguished from any and all PyMOL products distributed by DeLano -Scientific LLC in all publicity, advertising, and documentation. - -The slogans, "Includes PyMOL(TM).", "Based on PyMOL(TM) technology.", -"Contains PyMOL(TM) source code.", and "Built using PyMOL(TM).", may -be used in advertising, publicity, and documentation of derivative -software provided that the notice, "PyMOL is a trademark of DeLano -Scientific LLC.", is included in a footnote or at the end of the -document. - -All other endorsements employing the PyMOL trademark require specific, -written prior permission. + Open-Source PyMOL Copyright Notice + ================================== + + The Open-Source PyMOL source code is copyrighted, but you can freely + use and copy it as long as you don't change or remove any of the + Copyright notices. The Open-Source PyMOL product is made available + under the following open-source license terms: + + ---------------------------------------------------------------------- + Open-Source PyMOL is Copyright (C) Schrodinger, LLC. + + All Rights Reserved + + Permission to use, copy, modify, distribute, and distribute modified + versions of this software and its built-in documentation for any + purpose and without fee is hereby granted, provided that the above + copyright notice appears in all copies and that both the copyright + notice and this permission notice appear in supporting documentation, + and that the name of Schrodinger, LLC not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. + + SCHRODINGER, LLC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN + NO EVENT SHALL SCHRODINGER, LLC BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE + USE OR PERFORMANCE OF THIS SOFTWARE. + ---------------------------------------------------------------------- + + PyMOL Trademark Notice + ====================== + + PyMOL(TM) is a trademark of Schrodinger, LLC. Derivative + software which contains PyMOL source code must be plainly + distinguished from any and all PyMOL products distributed by Schrodinger, + LLC in all publicity, advertising, and documentation. + + The slogans, "Includes PyMOL(TM).", "Based on PyMOL(TM) technology.", + "Contains PyMOL(TM) source code.", and "Built using PyMOL(TM).", may + be used in advertising, publicity, and documentation of derivative + software provided that the notice, "PyMOL is a trademark of Schrodinger, + LLC.", is included in a footnote or at the end of the + document. + + All other endorsements employing the PyMOL trademark require specific, + written prior permission. + |