summaryrefslogtreecommitdiffstats
path: root/options/license/MIT-CMU
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-10-30 16:19:14 +0000
committerGitHub <noreply@github.com>2019-10-30 16:19:14 +0000
commitbda70b848fafc0bc74326ac6860b11a500218679 (patch)
treef339c401a8f2cfe80447193dd29c1d493d3508fd /options/license/MIT-CMU
parentbc1775b490a39c42497dc782c1e2effc5af47715 (diff)
downloadgitea-bda70b848fafc0bc74326ac6860b11a500218679.tar.gz
gitea-bda70b848fafc0bc74326ac6860b11a500218679.zip
Update licenses (#8752)
Replaces #8182
Diffstat (limited to 'options/license/MIT-CMU')
-rw-r--r--options/license/MIT-CMU35
1 files changed, 15 insertions, 20 deletions
diff --git a/options/license/MIT-CMU b/options/license/MIT-CMU
index 87cc4395fa..81c351b2ef 100644
--- a/options/license/MIT-CMU
+++ b/options/license/MIT-CMU
@@ -1,22 +1,17 @@
-Copyright 1989, 1991, 1992 by Carnegie Mellon University
+<copyright notice> By obtaining, using, and/or copying this software and/or
+its associated documentation, you agree that you have read, understood, and
+will comply with the following terms and conditions:
-Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of
-the University of California
+Permission to use, copy, modify, and distribute this software and its associated
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appears in all copies, and that both that
+copyright notice and this permission notice appear in supporting documentation,
+and that the name of the copyright holder not be used in advertising or publicity
+pertaining to distribution of the software without specific, written permission.
-All Rights Reserved
-
-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 appears in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation, and that the
-name of CMU and The Regents of the University of California not be used in
-advertising or publicity pertaining to distribution of the software without
-specific written permission.
-
-CMU AND THE REGENTS OF THE UNIVERSITY OF CALIFORNIA DISCLAIM ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL CMU OR THE REGENTS OF THE UNIVERSITY OF CALIFORNIA
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE COPYRIGHT HOLDER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.