summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-09 00:07:33 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-07-21 23:46:28 -0700
commit5b30118f1504fb065cf0b4aca150703834881d9e (patch)
tree7bf3ddc8404cd1b3c2d7d6487130277143e783a3 /COPYING
parentb4d59c18315b14b5fac1e01e158f461438e47fb4 (diff)
downloadxscope-5b30118f1504fb065cf0b4aca150703834881d9e.tar.gz
Convert Keith's personal license notice to X.Org standard MIT license notice
Acked-by: Keith Packard <keithp@keithp.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING21
1 files changed, 0 insertions, 21 deletions
diff --git a/COPYING b/COPYING
index 764dd81..5990ff1 100644
--- a/COPYING
+++ b/COPYING
@@ -64,27 +64,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
------------------------------------------------------------
Copyright © 2000, 2001 Keith Packard, member of The XFree86 Project, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, 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 Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Keith Packard makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 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.
-
- ------------------------------------------------------------
-
Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
Copyright © 2010 Intel Corporation