diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /xorg-server/xkeyboard-config/keymap/sgi_vndr/ch | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'xorg-server/xkeyboard-config/keymap/sgi_vndr/ch')
| -rw-r--r-- | xorg-server/xkeyboard-config/keymap/sgi_vndr/ch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch deleted file mode 100644 index ca35be7d9..000000000 --- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch +++ /dev/null @@ -1,65 +0,0 @@ -default xkb_keymap "de_indy" {
- xkb_keycodes { include "sgi_vndr/indy(universal)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc_universal)+ch(de)" };
- xkb_geometry { include "sgi_vndr/indy(pc102)" };
-};
-xkb_keymap "de_indy_nodeadkeys" {
- xkb_keycodes { include "sgi_vndr/indy(universal)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
- };
- xkb_geometry { include "sgi_vndr/indy(pc102)" };
-};
-xkb_keymap "de_indigo" {
- xkb_keycodes { include "sgi_vndr/indigo(pc102)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc102)+ch(de)" };
- xkb_geometry { include "sgi_vndr/indigo(pc102)" };
-};
-xkb_keymap "de_indigo_nodeadkeys" {
- xkb_keycodes { include "sgi_vndr/indigo(pc102)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
- };
- xkb_geometry { include "sgi_vndr/indigo(pc102)" };
-};
-
-default xkb_keymap "fr_indy" {
- xkb_keycodes { include "sgi_vndr/indy(universal)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc_universal)+ch(fr)" };
- xkb_geometry { include "sgi_vndr/indy(pc102)" };
-};
-xkb_keymap "fr_indy_nodeadkeys" {
- xkb_keycodes { include "sgi_vndr/indy(universal)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
- };
- xkb_geometry { include "sgi_vndr/indy(pc102)" };
-};
-xkb_keymap "fr_indigo" {
- xkb_keycodes { include "sgi_vndr/indigo(pc102)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc102)+ch(fr)" };
- xkb_geometry { include "sgi_vndr/indigo(pc102)" };
-};
-xkb_keymap "fr_indigo_nodeadkeys" {
- xkb_keycodes { include "sgi_vndr/indigo(pc102)" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols {
- include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
- };
- xkb_geometry { include "sgi_vndr/indigo(pc102)" };
-};
|