diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
| commit | fe6927d79e02d01cce20ecf56c8721fcadc2d278 (patch) | |
| tree | 7c8ae5a40c3e2cd7825097c06c87f01ab85a24f0 /xorg-server/xkbdata.src/rules/evdev.xml.in | |
| parent | c035ec13d812ca609dd31590b86952f14394b5ec (diff) | |
| download | vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.gz vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.bz2 vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/xkbdata.src/rules/evdev.xml.in')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/evdev.xml.in | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in index f43e651bb..24bfc2d6c 100644 --- a/xorg-server/xkbdata.src/rules/evdev.xml.in +++ b/xorg-server/xkbdata.src/rules/evdev.xml.in @@ -554,6 +554,13 @@ </model> <model> <configItem> + <name>hpmini110</name> + <_description>Hewlett-Packard Mini 110 Notebook</_description> + <vendor>Hewlett-Packard</vendor> + </configItem> + </model> + <model> + <configItem> <name>rapidaccess</name> <_description>IBM Rapid Access</_description> <vendor>IBM</vendor> @@ -575,13 +582,6 @@ </model> <model> <configItem> - <name>thinkpadintl</name> - <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad60</name> <_description>IBM ThinkPad R60/T60/R61/T61</_description> <vendor>IBM</vendor> @@ -1277,6 +1277,7 @@ <configItem> <name>rus</name> <_description>Russian phonetic</_description> + <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> <variant> @@ -3018,12 +3019,6 @@ <_description>LEKPa</_description> </configItem> </variant> - <variant> - <configItem> - <name>balticplus</name> - <_description>Baltic+</_description> - </configItem> - </variant> </variantList> </layout> <layout> @@ -3250,6 +3245,12 @@ <languageList><iso639Id>rus</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>dvp</name> + <_description>Programmer Dvorak</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3407,6 +3408,12 @@ </variant> <variant> <configItem> + <name>typewriter-legacy</name> + <_description>Typewriter, legacy</_description> + </configItem> + </variant> + <variant> + <configItem> <name>tt</name> <_description>Tatar</_description> <languageList><iso639Id>tat</iso639Id></languageList> @@ -3705,6 +3712,12 @@ <variantList> <variant> <configItem> + <name>legacy</name> + <_description>Legacy</_description> + </configItem> + </variant> + <variant> + <configItem> <name>de_nodeadkeys</name> <_description>German, eliminate dead keys</_description> </configItem> @@ -4408,6 +4421,12 @@ </option> <option> <configItem> + <name>grp:lctrl_rctrl_switch</name> + <_description>Left Ctrl (to first layout), Right Ctrl (to last layout)</_description> + </configItem> + </option> + <option> + <configItem> <name>grp:alt_caps_toggle</name> <_description>Alt+CapsLock</_description> </configItem> @@ -4444,6 +4463,12 @@ </option> <option> <configItem> + <name>grp:rctrl_rshift_toggle</name> + <_description>Right Ctrl+Right Shift</_description> + </configItem> + </option> + <option> + <configItem> <name>grp:ctrl_alt_toggle</name> <_description>Alt+Ctrl</_description> </configItem> @@ -4940,6 +4965,12 @@ </option> <option> <configItem> + <name>compose:lctrl</name> + <_description>Left Ctrl</_description> + </configItem> + </option> + <option> + <configItem> <name>compose:rctrl</name> <_description>Right Ctrl</_description> </configItem> |