Resync COPYING file with copyrights/licenses from code

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 33 insertions, 3 deletions

diff --git a/COPYING b/COPYING
index b67a2c5..2c39a67 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,9 @@
 (C) Copyright IBM Corporation 2006, 2007
 (C) Copyright Eric Anholt 2006
-Copyright (c) 2007, 2008, 2009, 2011, Oracle and/or its affiliates.
-Copyright 2009 Red Hat, Inc.
+(C) Copyright Mark Kettenis 2011
+(C) Copyright Robert Millan 2012
+Copyright (c) 2007, 2008, 2009, 2011, 2012, 2013 Oracle and/or its affiliates.
+Copyright 2009, 2012 Red Hat, Inc.
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,7 +28,9 @@ IN THE SOFTWARE.
 ------------------------------------------------------------------------------
 
 Copyright (c) 2008 Juan Romero Pardines
-Copyright (c) 2008 Mark Kettenis
+Copyright (c) 2008, 2011 Mark Kettenis
+Copyright (c) 2009 Michael Lorenz
+Copyright (c) 2009, 2012 Samuel Thibault
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -65,3 +69,29 @@ Except as contained in this notice, the name of the XFree86 Project shall
 not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from the
 XFree86 Project.
+
+------------------------------------------------------------------------------
+
+Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+Copyright (c) 2009 Tiago Vignatti
+
+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, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.