diff options
author | marha <marha@users.sourceforge.net> | 2009-12-17 14:31:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-12-17 14:31:58 +0000 |
commit | d34fc70fab4607f70184206a592397c97c3e478e (patch) | |
tree | 1830b57f249cb145896f7986ac9114d5b98d83ad /xorg-server/composite/compint.h | |
parent | 9b17452909d3140fa33a753cadfaa6e9006b9685 (diff) | |
download | vcxsrv-d34fc70fab4607f70184206a592397c97c3e478e.tar.gz vcxsrv-d34fc70fab4607f70184206a592397c97c3e478e.tar.bz2 vcxsrv-d34fc70fab4607f70184206a592397c97c3e478e.zip |
Git update 17/12/2009
Diffstat (limited to 'xorg-server/composite/compint.h')
-rw-r--r-- | xorg-server/composite/compint.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/xorg-server/composite/compint.h b/xorg-server/composite/compint.h index 852c277c2..845a196f6 100644 --- a/xorg-server/composite/compint.h +++ b/xorg-server/composite/compint.h @@ -2,29 +2,23 @@ * Copyright © 2006 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. + * 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 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. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * 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. + * 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. * * Copyright © 2003 Keith Packard * |