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/specs/XKB/xkblib.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 'libX11/specs/XKB/xkblib.xml')
| -rw-r--r-- | libX11/specs/XKB/xkblib.xml | 10 |
1 files changed, 6 insertions, 4 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> |