summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-10-25 14:44:06 (GMT)
committerGuido van Rossum <guido@python.org>1996-10-25 14:44:06 (GMT)
commitd266eb460e20ded087d01a29da0a230e235afc40 (patch)
tree7d9431a53f688f627eff56c7998476ee805dfd00 /Makefile.in
parent478f4871d74170bd1c9c9262eea043483c93ff76 (diff)
downloadcpython-d266eb460e20ded087d01a29da0a230e235afc40.zip
cpython-d266eb460e20ded087d01a29da0a230e235afc40.tar.gz
cpython-d266eb460e20ded087d01a29da0a230e235afc40.tar.bz2
New permission notice, includes CNRI.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in27
1 files changed, 17 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index f2627e0..8e75a10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,16 +9,23 @@
# provided that the above copyright notice appear in all copies and that
# both that copyright notice and this permission notice appear in
# supporting documentation, and that the names of Stichting Mathematisch
-# Centrum or CWI not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior permission.
-#
-# STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-# FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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.
+# Centrum or CWI or Corporation for National Research Initiatives or
+# CNRI not be used in advertising or publicity pertaining to
+# distribution of the software without specific, written prior
+# permission.
+#
+# While CWI is the initial source for this software, a modified version
+# is made available by the Corporation for National Research Initiatives
+# (CNRI) at the Internet address ftp://ftp.python.org.
+#
+# STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
+# CENTRUM OR CNRI 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.
########################################################################
# Top-level Makefile for Python