aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-12 08:39:09 +0100
committermarha <marha@users.sourceforge.net>2012-12-12 08:39:09 +0100
commitc648afe73ef43a15094508d2dd439e05738735bf (patch)
tree6d69f2726eb57d22395ffbe0b7733eebc16d1bb1 /xorg-server/xkeyboard-config/rules
parent853b3fc8ee9a4e7f26f87334655a3f5c772502b7 (diff)
parentb395c3c85251d4e8761704d8e3a3c9f9fa5b45cc (diff)
downloadvcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.gz
vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.tar.bz2
vcxsrv-c648afe73ef43a15094508d2dd439e05738735bf.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 5f0618166..8d8075004 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1598,6 +1598,12 @@
<variantList>
<variant>
<configItem>
+ <name>legacy</name>
+ <_description>German (legacy)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>nodeadkeys</name>
<_description>German (Austria, eliminate dead keys)</_description>
</configItem>