diff options
| author | Brian Curtin <brian@python.org> | 2012-06-21 21:36:05 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian@python.org> | 2012-06-21 21:36:05 (GMT) |
| commit | fe078f79207be3526ec488dee2a85f29fe530edd (patch) | |
| tree | f825fa22efc89e1219de5e411ba25a183abc2692 /PC | |
| parent | 6b2cf01744b06717f3082c97db235b66e9c7d1ba (diff) | |
| parent | 6a8ca3edfd84b5923a667c61c20ffac3c6c71b9a (diff) | |
| download | cpython-fe078f79207be3526ec488dee2a85f29fe530edd.zip cpython-fe078f79207be3526ec488dee2a85f29fe530edd.tar.gz cpython-fe078f79207be3526ec488dee2a85f29fe530edd.tar.bz2 | |
branch merge
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/launcher.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/PC/launcher.c b/PC/launcher.c index 60222c4..dfad44a 100644 --- a/PC/launcher.c +++ b/PC/launcher.c @@ -1,27 +1,6 @@ /* - * Copyright (C) 2011-2012 Vinay Sajip. All rights reserved. - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Copyright (C) 2011-2012 Vinay Sajip. + * Licensed to PSF under a contributor agreement. * * Based on the work of: * |