diff options
author | marha <marha@users.sourceforge.net> | 2010-09-04 20:35:29 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-04 20:35:29 +0000 |
commit | 86f0d840164841d04abfea284e2d9be5ba742537 (patch) | |
tree | b9bab35a924b788e6e3c96a81307ae2736648187 /libX11/specs/XIM/xim.xml | |
parent | f2523be58f4546b530ab03ece3a9dd1183f4deec (diff) | |
parent | ff7fa74dd9fde036f79d02e5810dd5ded98dae59 (diff) | |
download | vcxsrv-86f0d840164841d04abfea284e2d9be5ba742537.tar.gz vcxsrv-86f0d840164841d04abfea284e2d9be5ba742537.tar.bz2 vcxsrv-86f0d840164841d04abfea284e2d9be5ba742537.zip |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/specs/XIM/xim.xml')
-rw-r--r-- | libX11/specs/XIM/xim.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/specs/XIM/xim.xml b/libX11/specs/XIM/xim.xml index 66d559b07..07f6e3183 100644 --- a/libX11/specs/XIM/xim.xml +++ b/libX11/specs/XIM/xim.xml @@ -25,8 +25,8 @@ <copyright><year>1994</year><holder>X Consortium</holder></copyright>
<copyright><year>1993</year><holder>FUJITSU LIMITED</holder></copyright>
<copyright><year>1994</year><holder>FUJITSU LIMITED</holder></copyright>
- <copyright><year>1993</year><holder>Sun Microsystems</holder></copyright>
- <copyright><year>1994</year><holder>Sun Microsystems</holder></copyright>
+ <copyright><year>1993</year><holder>Oracle and/or its affiliates</holder></copyright>
+ <copyright><year>1994</year><holder>Oracle and/or its affiliates</holder></copyright>
<releaseinfo>Version 1.0</releaseinfo>
<affiliation><orgname>X Consortium</orgname></affiliation>
<productnumber>X Version 11, Release 7</productnumber>
|