summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2008-04-01 23:57:36 (GMT)
committerGuido van Rossum <guido@python.org>2008-04-01 23:57:36 (GMT)
commitb1ba750226fc11937bb1efdfefa4df1844120063 (patch)
tree00b6619793c95eadb6214d1dc7a9a1face880740 /Modules
parentf0a49708eb1a00eca83dbe26eb47e8506b80225f (diff)
downloadcpython-b1ba750226fc11937bb1efdfefa4df1844120063.zip
cpython-b1ba750226fc11937bb1efdfefa4df1844120063.tar.gz
cpython-b1ba750226fc11937bb1efdfefa4df1844120063.tar.bz2
Remove the advertising clause from the BSD license in timing.h.
I have the email trail to prove that George Neville-Neil approved this.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/timing.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/Modules/timing.h b/Modules/timing.h
index af26f1a..553d76f 100644
--- a/Modules/timing.h
+++ b/Modules/timing.h
@@ -10,14 +10,11 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by George V. Neville-Neil
- * 4. The name, George Neville-Neil may not be used to endorse or promote
- * products derived from this software without specific prior
+ * 3. The name, George Neville-Neil may not be used to endorse or promote
+ * products derived from this software without specific prior
* written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE