diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libX11 | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/specs/XKB/xkblib.xml | 10 | ||||
| -rw-r--r-- | libX11/specs/i18n/framework/framework.xml | 6 | ||||
| -rw-r--r-- | libX11/specs/i18n/trans/trans.xml | 9 | ||||
| -rw-r--r-- | libX11/specs/libX11/libX11.xml | 14 |
4 files changed, 22 insertions, 17 deletions
diff --git a/libX11/specs/XKB/xkblib.xml b/libX11/specs/XKB/xkblib.xml index e45841c98..1ca6f3e58 100644 --- a/libX11/specs/XKB/xkblib.xml +++ b/libX11/specs/XKB/xkblib.xml @@ -43,10 +43,12 @@ <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation> </author> </authorgroup> - <copyright><year>1995</year><year>1996</year><holder>X Consortium Inc.</holder></copyright> - <copyright><year>1995</year><year>1996</year><holder>Silicon Graphics Inc.</holder></copyright> - <copyright><year>1995</year><year>1996</year><holder>Hewlett-Packard Company</holder></copyright> - <copyright><year>1995</year><year>1996</year><holder>Digital Equipment Corporation</holder></copyright> + <copyright><year>1995</year><year>1996</year> + <holder>X Consortium Inc.</holder> + <holder>Silicon Graphics Inc.</holder> + <holder>Hewlett-Packard Company</holder> + <holder>Digital Equipment Corporation</holder> + </copyright> <legalnotice> <para> diff --git a/libX11/specs/i18n/framework/framework.xml b/libX11/specs/i18n/framework/framework.xml index 4d87d4736..fd88688bc 100644 --- a/libX11/specs/i18n/framework/framework.xml +++ b/libX11/specs/i18n/framework/framework.xml @@ -20,8 +20,10 @@ <affiliation><orgname>IBM Japan</orgname></affiliation> </othercredit> </authorgroup> - <copyright><year>1994</year><holder>TOSHIBA Corporation</holder></copyright> - <copyright><year>1994</year><holder>IBM Corporation</holder></copyright> + <copyright><year>1994</year> + <holder>TOSHIBA Corporation</holder> + <holder>IBM Corporation</holder> + </copyright> <legalnotice> diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml index 8e38e8963..6f1a15c50 100644 --- a/libX11/specs/i18n/trans/trans.xml +++ b/libX11/specs/i18n/trans/trans.xml @@ -17,12 +17,15 @@ <affiliation><orgname>FUJITSU LIMITED</orgname></affiliation> </author> </authorgroup> - <copyright><year>1994</year><holder>FUJITSU LIMITED</holder></copyright> - <copyright><year>1994</year><holder>X Consortium</holder></copyright> - + <copyright> + <year>1994</year> + <holder>FUJITSU LIMITED</holder> + <holder>X Consortium</holder> + </copyright> <abstract> +<title>Abstract</title> <para> This specification describes the transport layer interfaces between Xlib and IM Server, which makes various channels usable such as X protocol or TCP/IP, DECnet and etc. diff --git a/libX11/specs/libX11/libX11.xml b/libX11/specs/libX11/libX11.xml index 30d73b8f0..782c14ffa 100644 --- a/libX11/specs/libX11/libX11.xml +++ b/libX11/specs/libX11/libX11.xml @@ -60,17 +60,12 @@ <affiliation><orgname>Fujitsu OSSI</orgname></affiliation> </othercredit> </authorgroup> - <copyright><year>1985</year><year>1986</year><year>1987</year> - <year>1988</year><year>1989</year><year>1991</year><year>1994</year> - <year>1996</year><year>2002</year><holder>The Open Group</holder> - </copyright> - <copyright><year>1985</year><year>1986</year><year>1987</year> - <year>1988</year><year>1989</year><year>1991</year> - <holder>Digital Equipment Corporation</holder> - </copyright> <legalnotice> +<formalpara> +<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991, 1994, 1996, 2002 The Open Group</title> +<para></para></formalpara> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files @@ -102,6 +97,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. </para> +<formalpara> +<title>Copyright © 1985, 1986, 1987, 1988, 1989, 1991 Digital Equipment Corporation</title> +<para></para></formalpara> <para> Permission to use, copy, modify and distribute this documentation for any purpose and without fee is hereby granted, provided that the above copyright |