summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2010-01-14 20:48:20 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2010-01-14 20:48:20 -0800
commitb775e6fa006d78cac21bbfe52f1f721947ddc6ca (patch)
tree46f10757217e12aa09b9bc47b6068516ff68edba /COPYING
parentfac83b8116e19d4efbf8438d1cc485656cca5c60 (diff)
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING30
1 files changed, 1 insertions, 29 deletions
diff --git a/COPYING b/COPYING
index c57b3c8..90f1392 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,6 @@
(C) Copyright IBM Corporation 2006, 2007
(C) Copyright Eric Anholt 2006
+Copyright 2007, 2008, 2009 Sun Microsystems, Inc.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,35 +24,6 @@ IN THE SOFTWARE.
------------------------------------------------------------------------------
-Copyright 2007, 2008, 2009 Sun Microsystems, Inc. All rights reserved.
-
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-------------------------------------------------------------------------------
-
Copyright (c) 2008 Juan Romero Pardines
Copyright (c) 2008 Mark Kettenis