aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-13 19:59:46 +0200
committermarha <marha@users.sourceforge.net>2011-06-13 19:59:46 +0200
commit0d495843cebea4ae94a3138db2bf51da80a16391 (patch)
tree6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /xorg-server/xkeyboard-config/rules
parent01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff)
parentf4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff)
downloadvcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz
vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2
vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in10
-rw-r--r--xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst2
2 files changed, 11 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 64a8cc321..ed2869b54 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -55,6 +55,16 @@
</languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>hu</name>
+ <_description>German (with Hungarian letters and no dead keys)</_description>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>hun</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
index 0a976c233..1b9d1d182 100644
--- a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
@@ -1,5 +1,5 @@
ben basic in ben
-ben probhat in ben_probhat
+ben probhat in ben_probhat
dev basic in deva
dvorak $dvoraklayouts %v dvorak
dvorak basic us dvorak