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 /libXext/specs/dbelib.xml | |
| 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 'libXext/specs/dbelib.xml')
| -rw-r--r-- | libXext/specs/dbelib.xml | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libXext/specs/dbelib.xml b/libXext/specs/dbelib.xml index c642a511f..d3616fc36 100644 --- a/libXext/specs/dbelib.xml +++ b/libXext/specs/dbelib.xml @@ -24,11 +24,22 @@ <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname> <affiliation><orgname>X Consortium, Inc</orgname></affiliation> </othercredit> - <copyright><year>1989</year><holder>X Consortium, Inc and Digital Equipment Corporation</holder></copyright> - <copyright><year>1992</year><holder>X Consortium, Inc and Intergraph Corporation</holder></copyright> - <copyright><year>1993</year><holder>X Consortium, Inc and Silicon Graphics, Inc.</holder></copyright> - <copyright><year>1994</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright> - <copyright><year>1995</year><holder>X Consortium, Inc and Hewlett-Packard Company</holder></copyright> + <copyright><year>1989</year> + <holder>X Consortium Inc</holder> + <holder>Digital Equipment Corporation</holder> + </copyright> + <copyright><year>1992</year> + <holder>X Consortium Inc</holder> + <holder>Intergraph Corporation</holder> + </copyright> + <copyright><year>1993</year> + <holder>X Consortium Inc</holder> + <holder>Silicon Graphics, Inc.</holder> + </copyright> + <copyright><year>1994</year><year>1995</year> + <holder>X Consortium Inc</holder> + <holder>Hewlett-Packard Company</holder> + </copyright> <legalnotice> <para> |