diff options
| author | Guido van Rossum <guido@python.org> | 2008-04-01 23:59:06 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2008-04-01 23:59:06 (GMT) |
| commit | f122902f76cc0b6fed74909c7754a1dbfb4b7d6e (patch) | |
| tree | a6937f64a272fd535b89e713f298137e108902a8 | |
| parent | d9f1da0f2202f0af2aa8460fff63f583d3324c51 (diff) | |
| download | cpython-f122902f76cc0b6fed74909c7754a1dbfb4b7d6e.zip cpython-f122902f76cc0b6fed74909c7754a1dbfb4b7d6e.tar.gz cpython-f122902f76cc0b6fed74909c7754a1dbfb4b7d6e.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.
(Backport of r62097.)
| -rw-r--r-- | Modules/timing.h | 9 |
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 |