aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-12 20:56:18 +0000
committermarha <marha@users.sourceforge.net>2011-01-12 20:56:18 +0000
commitca14143b18b939ee4506936e77478f8c593802b5 (patch)
tree83cf183c0a8814b67d664d002611da95bc78a98f /xorg-server
parent0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (diff)
parent2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (diff)
downloadvcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.gz
vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.bz2
vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index b6f934334..cdb3bf96c 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3066,7 +3066,7 @@
<layout>
<configItem>
<name>latam</name>
- <_shortDescription>LAm</_shortDescription>
+ <_shortDescription>Esp</_shortDescription>
<_description>Latin American</_description>
<countryList>
<iso3166Id>AR</iso3166Id>