diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-22 15:42:49 +0200 |
| commit | 46d4f558531910ca1f3297da85b99334d6de2921 (patch) | |
| tree | 60c37077eb160948fe317a17ec4c19bef679aa35 /libXext/specs/synclib.xml | |
| parent | 0bf6df93b9fdbb7902bf1014d605c6876a3ad035 (diff) | |
| parent | c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983 (diff) | |
| download | vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.gz vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.tar.bz2 vcxsrv-46d4f558531910ca1f3297da85b99334d6de2921.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
Diffstat (limited to 'libXext/specs/synclib.xml')
| -rw-r--r-- | libXext/specs/synclib.xml | 19 |
1 files changed, 8 insertions, 11 deletions
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 @@ <affiliation><orgname>X Consortium, Inc.</orgname></affiliation> </author> </authorgroup> -<legalnotice> - -<para> -Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts -</para> + <copyright><year>1991</year> + <holder>Olivetti Research Limited, Cambridge England</holder> + <holder>Digital Equipment Corporation, Maynard, Massachusetts</holder> + </copyright> +<legalnotice> <para> 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. </legalnotice> <legalnotice> - -<para> -Copyright © 1991 X Consortium, Inc. -</para> - +<para role="multiLicensing">Copyright © 1991 X Consortium, Inc.</para> <para> 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. </para> -<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +<para>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. </para> +<para>X Window System is a trademark of The OpenGroup.</para> </legalnotice> </bookinfo> |