diff options
author | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
commit | 097c0d8400d976c5c372db576a11764e87994c7f (patch) | |
tree | b5f977f9277f70f94f22ef221602ed318592a912 /xorg-server/xkeyboard-config/symbols/de | |
parent | 03fa24f76277662240d0af8770e168fc38b533cb (diff) | |
parent | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff) | |
download | vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.gz vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.bz2 vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/i18n/trans/trans.xml
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_print_visitor.cpp
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/rules/xkb.dtd
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/de')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/de | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 170abb183..b3da23a2a 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -485,21 +485,6 @@ xkb_symbols "dsb_qwertz" key <AD09> { [ o, O, oacute, Oacute ] };
};
-partial alphanumeric_keys
-xkb_symbols "qwerty" {
-
- // This layout should work exactly as a de with the exception
- // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
- // 2008 by Matej Košík <kosik@fiit.stuba.sk>
-
- include "de(basic)"
-
- name[Group1] = "German (qwerty)";
-
- key <AB01> { [ z, Z, leftarrow, yen ] };
- key <AD06> { [ y, Y, guillemotleft, less ] };
-};
-
// layout for Russian letters on an german keyboard
// based on US-RU layout by Ivan Popov <pin@konvalo.org> 2005-07-17
// adopted for german layout by Alexey Fisher <bug-track@fisher-privat.net> 2010-08-19
|