From: Ben Pfaff Date: Wed, 8 Sep 2004 00:07:56 +0000 (+0000) Subject: Fix license: we don't want export clause. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8de1d4825919a0daf905026552916e59aa4c8117;p=pintos-anon Fix license: we don't want export clause. --- diff --git a/LICENSE b/LICENSE index ef24560..30e57e7 100644 --- a/LICENSE +++ b/LICENSE @@ -67,25 +67,23 @@ Other code, and modifications to the above code made for this project, is subject to the following license: Copyright 2004 Board of Trustees, Leland Stanford Jr. University - All rights reserved. - -Export of this software from the United States of America may require a -specific license from the United States Government. It is the -responsibility of any person or organization contemplating export to -obtain such a license before exporting. -WITHIN THAT CONSTRAINT, 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 supporting documentation, and that the name of Stanford -University not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior permission. -Stanford University makes no representations about the suitability of -this software for any purpose. It is provided "as is" without express -or implied warranty. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.