aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
committermarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
commit68c12003597662f95eac07ddeee99637f7caa3e5 (patch)
tree7be6c75560e85d73363da29707ed674ecf11552f /xorg-server/xkeyboard-config
parente8eef3451671e4bea36194c85c16241e80163f8d (diff)
parentf93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff)
downloadvcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.gz
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.bz2
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver libxcb xcbproto mesa xkeyboard-config git update 27 Dec 2013
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in12
1 files changed, 2 insertions, 10 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index aa47e3da0..dd3251b6e 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -689,20 +689,12 @@
<variantList>
<variant>
<configItem>
- <name>dvorak_a5</name>
- <_description>Swedish (Dvorak A5)</_description>
- </configItem>
- </variant>
- </variantList>
- <variantList>
- <variant>
- <configItem>
<name>sun_type6</name>
<_description>Swedish (Sun Type 6/7)</_description>
</configItem>
</variant>
- </variantList>
- </layout>
+ </variantList>
+ </layout>
<layout>
<configItem>
<name>ch</name>