diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-15 15:11:10 +0200 |
| commit | 4095d7af9f50126361eb7b0aeba6869786f63d5c (patch) | |
| tree | 949709675ee9efb10c9c65dc55615444d469e63a /libX11/specs | |
| parent | a0fc33d46dfe59745f22decb93fe147292335602 (diff) | |
| parent | 4420369d700d9db1563f8647e1889c6a0972ea2c (diff) | |
| download | vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.gz vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.bz2 vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11/specs')
| -rw-r--r-- | libX11/specs/XIM/xim.xml | 1 | ||||
| -rw-r--r-- | libX11/specs/XKB/xkblib.xml | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libX11/specs/XIM/xim.xml b/libX11/specs/XIM/xim.xml index fbb603c20..dc4b8c804 100644 --- a/libX11/specs/XIM/xim.xml +++ b/libX11/specs/XIM/xim.xml @@ -27,7 +27,6 @@ <copyright><year>1993</year><year>1994</year><holder>FUJITSU LIMITED</holder></copyright> <copyright><year>1993</year><year>1994</year><holder>Oracle and/or its affiliates</holder></copyright> <releaseinfo>Version 1.0</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> <abstract> <para> diff --git a/libX11/specs/XKB/xkblib.xml b/libX11/specs/XKB/xkblib.xml index 3ed55285b..e45841c98 100644 --- a/libX11/specs/XKB/xkblib.xml +++ b/libX11/specs/XKB/xkblib.xml @@ -11,6 +11,7 @@ <bookinfo> <title>The X Keyboard Extension:</title> <subtitle>Library Specification</subtitle> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Amber</firstname> @@ -42,13 +43,12 @@ <affiliation><orgname>Digital Equipment Corporation</orgname></affiliation> </author> </authorgroup> - <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> + <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> <legalnotice> -<para>Copyright © 1995, 1996 X Consortium Inc.</para> -<para>Copyright © 1995, 1996 Silicon Graphics Inc.</para> -<para>Copyright © 1995, 1996 Hewlett-Packard Company</para> -<para>Copyright © 1995, 1996 Digital Equipment Corporation</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), |