Author: guido.van.rossum Date: Wed Apr 2 01:59:06 2008 New Revision: 62098 Modified: python/branches/release25-maint/Modules/timing.h Log: 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.) Modified: python/branches/release25-maint/Modules/timing.h ============================================================================== --- python/branches/release25-maint/Modules/timing.h (original) +++ python/branches/release25-maint/Modules/timing.h Wed Apr 2 01:59:06 2008 @@ -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