diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 10:38:33 +0100 |
| commit | 24635abae6008bef13e30d798b3f33abab412770 (patch) | |
| tree | e799fbde24e0fd935af76b0bc48d30ef69f75d54 /xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst | |
| parent | e0844ae8b5ef87049537a7e0ebff81acc2695256 (diff) | |
| parent | 6ce1d8f0f8c23e186175a7c84c21d7bfbe168dc5 (diff) | |
| download | vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.gz vcxsrv-24635abae6008bef13e30d798b3f33abab412770.tar.bz2 vcxsrv-24635abae6008bef13e30d798b3f33abab412770.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Changed file permissions
dos -> unix
Conflicts:
libX11/include/X11/Xregion.h
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/StrKeysym.c
libX11/src/Window.c
libX11/src/xkb/XKBBind.c
libX11/src/xkb/XKBGetMap.c
libX11/src/xkb/XKBSetGeom.c
libX11/src/xkb/XKBUse.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libXdmcp/Key.c
libXdmcp/Write.c
libxcb/src/xcb_windefs.h
xkbcomp/keycodes.c
xkbcomp/xkbpath.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mln_s.sh
xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst index 2318de247..cecda6d8a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst +++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst @@ -1,27 +1,27 @@ -ar ara
-ben in(ben)
-bs ba
-cs rs
-cz_qwerty cz(qwerty)
-dev in(deva)
-dvorak us(dvorak)
-dzdwi bt
-el gr
-en_US latin
-guj in(guj)
-gur in(guru)
-iu ca(ike)
-lo la
-kan in(kan)
-mi mao
-ml in(mal)
-ogham ie(ogam)
-ori ie(ori)
-sapmi no(smi)
-sr srp
-syr sy(syc)
-tel in(tel)
-tml in(tam)
-yu srp
-fr-latin9 fr(latin9)
-us_intl us(alt-intl)
+ar ara +ben in(ben) +bs ba +cs rs +cz_qwerty cz(qwerty) +dev in(deva) +dvorak us(dvorak) +dzdwi bt +el gr +en_US latin +guj in(guj) +gur in(guru) +iu ca(ike) +lo la +kan in(kan) +mi mao +ml in(mal) +ogham ie(ogam) +ori ie(ori) +sapmi no(smi) +sr srp +syr sy(syc) +tel in(tel) +tml in(tam) +yu srp +fr-latin9 fr(latin9) +us_intl us(alt-intl) |