summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1994-05-23 12:33:44 (GMT)
committerGuido van Rossum <guido@python.org>1994-05-23 12:33:44 (GMT)
commitb3107c3beef67b75458ba68bf3482a263f7ec7fd (patch)
tree001e5b6acb3aeeeb78e678086d85ad9a44e830fb
parenta9df70e02b74c9aee3cf08cafe72b6cbc55bcb6f (diff)
downloadcpython-b3107c3beef67b75458ba68bf3482a263f7ec7fd.zip
cpython-b3107c3beef67b75458ba68bf3482a263f7ec7fd.tar.gz
cpython-b3107c3beef67b75458ba68bf3482a263f7ec7fd.tar.bz2
ACKS: added Rickard Westman
CXOPYRIGHT: removed spaces at end of some lines
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/COPYRIGHT6
2 files changed, 4 insertions, 3 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 93e5d3e..3fb74f1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -70,5 +70,6 @@ Quentin Stafford-Fraser
Tracy Tims
Bennett Todd
Jaap Vermeulen
+Rickard Westman
Dik Winter
tim@prl.philips.nl
diff --git a/Misc/COPYRIGHT b/Misc/COPYRIGHT
index 38ad364..56a1b93 100644
--- a/Misc/COPYRIGHT
+++ b/Misc/COPYRIGHT
@@ -3,10 +3,10 @@ Amsterdam, The Netherlands.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+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.