summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-10-17 13:51:28 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-10-17 13:51:28 -0700
commit77f274b6386301cb31c074061a8c947a78b49da9 (patch)
tree8caeda26d9b60314e10e8d571da158ef6c2d07ab
parent482d1da02498a6a31a6d829a5be41727f6333f94 (diff)
downloadlibpciaccess-77f274b6386301cb31c074061a8c947a78b49da9.tar.gz
libpciaccess-77f274b6386301cb31c074061a8c947a78b49da9.tar.bz2
libpciaccess-77f274b6386301cb31c074061a8c947a78b49da9.zip
Update COPYING with the rest of the copyright/license notices from the code
-rw-r--r--COPYING22
1 files changed, 20 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 7ec9c42..b38c33e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
-(C) Copyright IBM Corporation 2006
+(C) Copyright IBM Corporation 2006, 2007
+(C) Copyright Eric Anholt 2006
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,7 +23,7 @@ IN THE SOFTWARE.
------------------------------------------------------------------------------
-Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+Copyright 2007, 2008 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
@@ -48,3 +49,20 @@ 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
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, 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.