diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /xorg-server/xkeyboard-config | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/la | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 47d160e30..7c94620ab 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -4192,7 +4192,7 @@ <name>rs</name> <!-- Keyboard indicator for Serbian layouts --> <_shortDescription>sr</_shortDescription> - <_description>Serbian</_description> + <_description>Serbian (Cyrillic)</_description> <languageList> <iso639Id>srp</iso639Id> </languageList> @@ -4201,7 +4201,7 @@ <variant> <configItem> <name>yz</name> - <_description>Serbian (Z and ZHE swapped)</_description> + <_description>Serbian (Cyrillic, Z and ZHE swapped)</_description> </configItem> </variant> <variant> @@ -4231,7 +4231,7 @@ <variant> <configItem> <name>alternatequotes</name> - <_description>Serbian (with guillemets)</_description> + <_description>Serbian (Cyrillic with guillemets)</_description> </configItem> </variant> <variant> diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la index a174ddfcc..269cb2618 100644 --- a/xorg-server/xkeyboard-config/symbols/la +++ b/xorg-server/xkeyboard-config/symbols/la @@ -62,14 +62,6 @@ xkb_symbols "basic" { key <AB09> { [ 0x1000ec3, dollar ]}; key <AB10> { [ 0x1000e9d, parenright ]}; -override key <LFSH> { - type[Group1]="PC_ALT_LEVEL2", - [ Shift_L, ISO_First_Group ] - }; -override key <RTSH> { - type[Group1]="PC_ALT_LEVEL2", - [ Shift_R, ISO_Last_Group ] - }; }; partial |