summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-12-03 16:32:01 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-12-07 11:10:35 -0800
commit2db6951763115a4a5dfac53d1a8f78ac33f91235 (patch)
treef686b1e6cd8a4c6ee091ce83be1d4ecbd84ede37 /COPYING
parentf06e8a61d6ed8f3054878167bffee619f852aad9 (diff)
downloadxserver-2db6951763115a4a5dfac53d1a8f78ac33f91235.tar.gz
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 3aad5faf6..bbf09ca76 100644
--- a/COPYING
+++ b/COPYING
@@ -15,11 +15,11 @@ Copyright © 2006 Nokia Corporation
Copyright © 2006-2008 Peter Hutterer
Copyright © 2006 Adam Jackson
Copyright © 2009-2010 NVIDIA Corporation
+Copyright © 1987, 2003-2006, 2008-2009 Oracle and/or its affiliates.
Copyright © 1999 Keith Packard
Copyright © 2007-2009 Red Hat, Inc.
Copyright © 2005-2008 Daniel Stone
Copyright © 2006-2009 Simon Thum
-Copyright © 1987, 2003-2006, 2008-2009 Sun Microsystems, Inc.
Copyright © 2006 Luc Verhaegen
Permission is hereby granted, free of charge, to any person obtaining a