diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-18 14:43:25 +0200 |
| commit | a27ca45b676116ebbce31973bc1a319cad76ffbf (patch) | |
| tree | 098711ced704936739bc91abbd75942a815d89db /xorg-server/xkeyboard-config/rules/base.extras.xml.in | |
| parent | 0b89941658d6117d17555ee28c6e5d7715673705 (diff) | |
| parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
| download | vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.gz vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.tar.bz2 vcxsrv-a27ca45b676116ebbce31973bc1a319cad76ffbf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.extras.xml.in')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index dd7339390..9107c03f2 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -120,6 +120,12 @@ <_description>German (Sun Type 6/7)</_description> </configItem> </variant> + <variant> + <configItem> + <name>adnw</name> + <_description>German (Aus der Neo-Welt)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -689,6 +695,12 @@ <variantList> <variant> <configItem> + <name>dvorak_a5</name> + <_description>Swedish (Dvorak A5)</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sun_type6</name> <_description>Swedish (Sun Type 6/7)</_description> </configItem> |