From 135e2e73bbe7155901a651c38b772e7b4547f39c Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 2 Nov 2010 07:32:01 +0000 Subject: libX11 libXdmcp xkbcomp pixman git update 2/11/2010 --- pixman/COPYING | 81 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'pixman/COPYING') diff --git a/pixman/COPYING b/pixman/COPYING index b0571e6a6..48ea58bdd 100644 --- a/pixman/COPYING +++ b/pixman/COPYING @@ -1,40 +1,41 @@ -The following is the 'standard copyright' agreed upon by most contributors, -and is currently the canonical license, though a modification is currently -under discussion. Copyright holders of new code should use this license -statement where possible, and append their name to this list. - -Copyright 1987, 1988, 1989, 1998 The Open Group -Copyright 1987, 1988, 1989 Digital Equipment Corporation -Copyright 1999, 2004, 2008 Keith Packard -Copyright 2000 SuSE, Inc. -Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. -Copyright 2004, 2005, 2007, 2008 Red Hat, Inc. -Copyright 2004 Nicholas Miell -Copyright 2005 Lars Knoll & Zack Rusin, Trolltech -Copyright 2005 Trolltech AS -Copyright 2007 Luca Barbato -Copyright 2008 Aaron Plattner, NVIDIA Corporation -Copyright 2008 Rodrigo Kumpera -Copyright 2008 André Tupinambá -Copyright 2008 Mozilla Corporation -Copyright 2008 Frederic Plourde -Copyright 2009 Sun Microsystems, Inc. - -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 (including the next -paragraph) 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. +The following is the MIT license, agreed upon by most contributors. +Copyright holders of new code should use this license statement where +possible. They may also add themselves to the list below. + +/* + * Copyright 1987, 1988, 1989, 1998 The Open Group + * Copyright 1987, 1988, 1989 Digital Equipment Corporation + * Copyright 1999, 2004, 2008 Keith Packard + * Copyright 2000 SuSE, Inc. + * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. + * Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2004 Nicholas Miell + * Copyright 2005 Lars Knoll & Zack Rusin, Trolltech + * Copyright 2005 Trolltech AS + * Copyright 2007 Luca Barbato + * Copyright 2008 Aaron Plattner, NVIDIA Corporation + * Copyright 2008 Rodrigo Kumpera + * Copyright 2008 André Tupinambá + * Copyright 2008 Mozilla Corporation + * Copyright 2008 Frederic Plourde + * Copyright 2009 Sun Microsystems, Inc. + * + * 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 (including the next + * paragraph) 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. + */ -- cgit v1.2.3