From c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 22 Sep 2011 15:20:09 +0200 Subject: libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 --- libXext/specs/dbelib.xml | 8 ++++---- libXext/specs/dpmslib.xml | 4 +--- libXext/specs/shapelib.xml | 2 +- libXext/specs/synclib.xml | 19 ++++++++----------- libXext/specs/xtest1.xml | 29 +++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+), 19 deletions(-) (limited to 'libXext') diff --git a/libXext/specs/dbelib.xml b/libXext/specs/dbelib.xml index d3616fc36..b0001b321 100644 --- a/libXext/specs/dbelib.xml +++ b/libXext/specs/dbelib.xml @@ -19,11 +19,11 @@ IanElliot Hewlett-Packard Company + + DavidP.Wiggins + X Consortium, Inc + - - DavidP.Wiggins - X Consortium, Inc - 1989 X Consortium Inc Digital Equipment Corporation diff --git a/libXext/specs/dpmslib.xml b/libXext/specs/dpmslib.xml index 93e6398c7..60565b536 100644 --- a/libXext/specs/dpmslib.xml +++ b/libXext/specs/dpmslib.xml @@ -33,9 +33,7 @@ of the information in this document. This documentation is provided "as is" without express or implied warranty. - -X Window System is a trademark of The Open Group. - +X Window System is a trademark of The Open Group. diff --git a/libXext/specs/shapelib.xml b/libXext/specs/shapelib.xml index 9a158ee61..525cbbe6e 100644 --- a/libXext/specs/shapelib.xml +++ b/libXext/specs/shapelib.xml @@ -19,7 +19,6 @@ MIT X Consortium - MIT X Consortium 1989X Consortium @@ -54,6 +53,7 @@ Except as contained in this notice, the name of the X Consortium 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 X Consortium. +X Window System is a trademark of The OpenGroup. diff --git a/libXext/specs/synclib.xml b/libXext/specs/synclib.xml index 51b7cf5e3..12145eb2d 100644 --- a/libXext/specs/synclib.xml +++ b/libXext/specs/synclib.xml @@ -45,12 +45,12 @@ X Consortium, Inc. - - - -Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts - + 1991 + Olivetti Research Limited, Cambridge England + Digital Equipment Corporation, Maynard, Massachusetts + + Permission to use, copy, modify, and distribute this documentation for any purpose and without fee is hereby granted, provided that the above @@ -62,11 +62,7 @@ is without express or implied warranty. - - -Copyright © 1991 X Consortium, Inc. - - +Copyright © 1991 X Consortium, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -82,7 +78,7 @@ 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, +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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR @@ -97,6 +93,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. +X Window System is a trademark of The OpenGroup. diff --git a/libXext/specs/xtest1.xml b/libXext/specs/xtest1.xml index 9229d273e..df05881ce 100644 --- a/libXext/specs/xtest1.xml +++ b/libXext/specs/xtest1.xml @@ -18,6 +18,35 @@ 1993X Consortium + + +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 X +CONSORTIUM 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. + + +Except as contained in this notice, the name of the X Consortium 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 X Consortium. + +X Window System is a trademark of The Open Group. + + This is a proposal for an extension to the X11 server and Xlib. -- cgit v1.2.3